Skip to content

Commit 882af21

Browse files
ashah-splunkashah-splunk
committed
updated compile files
1 parent 9c2633e commit 882af21

File tree

4 files changed

+51
-16
lines changed

4 files changed

+51
-16
lines changed

‎client/splunk.js

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,6 +1429,10 @@ var __exportName = 'splunkjs';
14291429

14301430
makeRequest: function(url, message) {
14311431
message.headers["Splunk-Client"] = "splunk-sdk-javascript/" + SDK_VERSION;
1432+
if(message.response_timeout != undefined){
1433+
message.headers["Response-Timeout"] = message.response_timeout;
1434+
}
1435+
14321436
var that = this;
14331437
var complete_response;
14341438
var params = {
@@ -1448,6 +1452,13 @@ var __exportName = 'splunkjs';
14481452
return Promise.resolve(complete_response)
14491453
}),
14501454
error: function(res, data, error) {
1455+
// Format abort response
1456+
if(res.status === 600){
1457+
data = JSON.parse(res.responseText).statusCode;
1458+
let response = JSON.parse(res.responseText);
1459+
complete_response = that._buildResponse("abort",response,{});
1460+
return Promise.reject(complete_response);
1461+
}
14511462
var response = {
14521463
statusCode: res.status,
14531464
headers: getHeaders(res.getAllResponseHeaders())
@@ -1466,7 +1477,9 @@ var __exportName = 'splunkjs';
14661477

14671478
return $.ajax(params).then((xhr)=>{
14681479
return complete_response;
1469-
})
1480+
}).catch((err)=>{
1481+
return complete_response;
1482+
});
14701483
},
14711484

14721485
parseJson: function(json) {
@@ -1564,6 +1577,9 @@ var __exportName = 'splunkjs';
15641577
// use this.
15651578
message.headers["X-ProxyDestination"] = url;
15661579
message.headers["Splunk-Client"] = "splunk-sdk-javascript/" + SDK_VERSION;
1580+
if(message.response_timeout != undefined){
1581+
message.headers["Response-Timeout"] = message.response_timeout;
1582+
}
15671583

15681584
// Need to remove the hostname from the URL
15691585
var parsed = parseUri(url);
@@ -1572,7 +1588,6 @@ var __exportName = 'splunkjs';
15721588

15731589
// Now, we prepend the prefix
15741590
url = this.prefix + url;
1575-
15761591
var that = this;
15771592
var complete_response;
15781593
var params = {
@@ -1592,7 +1607,13 @@ var __exportName = 'splunkjs';
15921607
return Promise.resolve(complete_response);
15931608
},
15941609
error: function(res, data, error) {
1595-
1610+
// Format abort response
1611+
if(res.status === 600){
1612+
data = JSON.parse(res.responseText).statusCode;
1613+
let response = JSON.parse(res.responseText);
1614+
complete_response = that._buildResponse("abort",response,{});
1615+
return Promise.reject(complete_response);
1616+
}
15961617
var response = {
15971618
statusCode: res.status,
15981619
headers: getHeaders(res.getAllResponseHeaders())
@@ -1612,7 +1633,9 @@ var __exportName = 'splunkjs';
16121633

16131634
return $.ajax(params).then((xhr)=>{
16141635
return complete_response;
1615-
})
1636+
}).catch((err)=>{
1637+
return complete_response;
1638+
});
16161639
},
16171640

16181641
makeRequestAsync: function(url, message) {
@@ -1621,7 +1644,10 @@ var __exportName = 'splunkjs';
16211644
// use this.
16221645
message.headers["X-ProxyDestination"] = url;
16231646
message.headers["Splunk-Client"] = "splunk-sdk-javascript/" + SDK_VERSION;
1624-
1647+
if(message.response_timeout != undefined){
1648+
message.headers["Response-Timeout"] = message.response_timeout;
1649+
}
1650+
16251651
// Need to remove the hostname from the URL
16261652
var parsed = parseUri(url);
16271653
var prefixToRemove = "" + (parsed.protocol ? parsed.protocol : "") + "://" + parsed.authority;
@@ -1649,6 +1675,13 @@ var __exportName = 'splunkjs';
16491675
return Promise.resolve(complete_response);
16501676
},
16511677
error: function(res, data, error) {
1678+
// Format abort response
1679+
if(res.status === 600){
1680+
data = JSON.parse(res.responseText).statusCode;
1681+
let response = JSON.parse(res.responseText);
1682+
complete_response = that._buildResponse("abort",response,{});
1683+
return Promise.reject(complete_response);
1684+
}
16521685
var response = {
16531686
statusCode: res.status,
16541687
headers: getHeaders(res.getAllResponseHeaders()),
@@ -1667,7 +1700,9 @@ var __exportName = 'splunkjs';
16671700

16681701
return $.ajax(params).then((xhr)=>{
16691702
return complete_response;
1670-
})
1703+
}).catch((err)=>{
1704+
return complete_response;
1705+
});
16711706
},
16721707

16731708
parseJson: function(json) {
@@ -29365,7 +29400,7 @@ module.exports={
2936529400
"_args": [
2936629401
[
2936729402
"[email protected]",
29368-
"/Users/abhis/Documents/JS/splunk-sdk-javascript"
29403+
"/Users/abhis/Documents/GitHub/splunk-sdk-javascript"
2936929404
]
2937029405
],
2937129406
"_development": true,
@@ -29391,7 +29426,7 @@ module.exports={
2939129426
],
2939229427
"_resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
2939329428
"_spec": "6.5.4",
29394-
"_where": "/Users/abhis/Documents/JS/splunk-sdk-javascript",
29429+
"_where": "/Users/abhis/Documents/GitHub/splunk-sdk-javascript",
2939529430
"author": {
2939629431
"name": "Fedor Indutny",
2939729432
"email": "[email protected]"
@@ -39275,7 +39310,7 @@ module.exports={
3927539310
"_args": [
3927639311
[
3927739312
"[email protected]",
39278-
"/Users/abhis/Documents/JS/splunk-sdk-javascript"
39313+
"/Users/abhis/Documents/GitHub/splunk-sdk-javascript"
3927939314
]
3928039315
],
3928139316
"_from": "[email protected]",
@@ -39299,7 +39334,7 @@ module.exports={
3929939334
],
3930039335
"_resolved": "https://registry.npmjs.org/needle/-/needle-3.0.0.tgz",
3930139336
"_spec": "3.0.0",
39302-
"_where": "/Users/abhis/Documents/JS/splunk-sdk-javascript",
39337+
"_where": "/Users/abhis/Documents/GitHub/splunk-sdk-javascript",
3930339338
"author": {
3930439339
"name": "Tomás Pollak",
3930539340
"email": "[email protected]"

‎client/splunk.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/splunk.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39951,7 +39951,7 @@ module.exports={
3995139951
"_args": [
3995239952
[
3995339953
"[email protected]",
39954-
"/Users/abhis/Documents/JS/splunk-sdk-javascript"
39954+
"/Users/abhis/Documents/GitHub/splunk-sdk-javascript"
3995539955
]
3995639956
],
3995739957
"_development": true,
@@ -39977,7 +39977,7 @@ module.exports={
3997739977
],
3997839978
"_resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
3997939979
"_spec": "6.5.4",
39980-
"_where": "/Users/abhis/Documents/JS/splunk-sdk-javascript",
39980+
"_where": "/Users/abhis/Documents/GitHub/splunk-sdk-javascript",
3998139981
"author": {
3998239982
"name": "Fedor Indutny",
3998339983
"email": "[email protected]"
@@ -50763,7 +50763,7 @@ module.exports={
5076350763
"_args": [
5076450764
[
5076550765
"[email protected]",
50766-
"/Users/abhis/Documents/JS/splunk-sdk-javascript"
50766+
"/Users/abhis/Documents/GitHub/splunk-sdk-javascript"
5076750767
]
5076850768
],
5076950769
"_from": "[email protected]",
@@ -50787,7 +50787,7 @@ module.exports={
5078750787
],
5078850788
"_resolved": "https://registry.npmjs.org/needle/-/needle-3.0.0.tgz",
5078950789
"_spec": "3.0.0",
50790-
"_where": "/Users/abhis/Documents/JS/splunk-sdk-javascript",
50790+
"_where": "/Users/abhis/Documents/GitHub/splunk-sdk-javascript",
5079150791
"author": {
5079250792
"name": "Tomás Pollak",
5079350793
"email": "[email protected]"

‎client/splunk.test.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)