Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Sebastien Robin
erp5
Commits
17c390c7
Commit
17c390c7
authored
Dec 19, 2017
by
Alain Takoudjou
Committed by
Rafael Monnerat
Sep 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_monitoring] set timeout value to prevent stalled sync on bad URL
parent
e6ddd213
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
9 deletions
+22
-9
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.js
...Item/web_page_module/gadget_officejs_monitoring_jio_js.js
+1
-0
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.xml
...tem/web_page_module/gadget_officejs_monitoring_jio_js.xml
+2
-2
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_storage_js.js
...TemplateItem/web_page_module/monitoring_jio_storage_js.js
+11
-3
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_storage_js.xml
...emplateItem/web_page_module/monitoring_jio_storage_js.xml
+2
-2
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_web_storage_js.js
...lateItem/web_page_module/monitoring_jio_web_storage_js.js
+4
-0
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_web_storage_js.xml
...ateItem/web_page_module/monitoring_jio_web_storage_js.xml
+2
-2
No files found.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.js
View file @
17c390c7
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
type
:
"
replicatedopml
"
,
type
:
"
replicatedopml
"
,
remote_storage_unreachable_status
:
"
WARNING
"
,
remote_storage_unreachable_status
:
"
WARNING
"
,
remote_opml_check_time_interval
:
86400000
,
remote_opml_check_time_interval
:
86400000
,
request_timeout
:
25000
,
// timeout is to 25 second
local_sub_storage
:
{
local_sub_storage
:
{
type
:
"
query
"
,
type
:
"
query
"
,
sub_storage
:
{
sub_storage
:
{
...
...
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.xml
View file @
17c390c7
...
@@ -239,7 +239,7 @@
...
@@ -239,7 +239,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
2.48734.54444.887
</string>
</value>
<value>
<string>
96
4.14420.61705.7611
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -257,7 +257,7 @@
...
@@ -257,7 +257,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
07899173.02
</float>
<float>
15
13617981.41
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_storage_js.js
View file @
17c390c7
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
* "type": "replicatedopml",
* "type": "replicatedopml",
* "remote_storage_unreachable_status": "WARNING",
* "remote_storage_unreachable_status": "WARNING",
* "remote_opml_check_time_interval": 86400000,
* "remote_opml_check_time_interval": 86400000,
* "request_timeout": 0,
* local_sub_storage: {
* local_sub_storage: {
* type: "query",
* type: "query",
* sub_storage: {
* sub_storage: {
...
@@ -73,6 +74,10 @@
...
@@ -73,6 +74,10 @@
// one day in miliseconds
// one day in miliseconds
this
.
_remote_opml_check_time_interval
=
86400000
;
this
.
_remote_opml_check_time_interval
=
86400000
;
}
}
this
.
_request_timeout
=
spec
.
request_timeout
;
if
(
this
.
_request_timeout
===
undefined
)
{
this
.
_request_timeout
=
0
;
// no timeout
}
}
}
ReplicatedOPMLStorage
.
prototype
.
get
=
function
()
{
ReplicatedOPMLStorage
.
prototype
.
get
=
function
()
{
...
@@ -446,7 +451,8 @@
...
@@ -446,7 +451,8 @@
attachment_id
:
'
enclosure
'
,
attachment_id
:
'
enclosure
'
,
parser
:
'
rss
'
,
parser
:
'
rss
'
,
sub_storage
:
{
sub_storage
:
{
type
:
"
http
"
type
:
"
http
"
,
timeout
:
context
.
_request_timeout
}
}
},
},
id_hash
,
id_hash
,
...
@@ -459,7 +465,8 @@
...
@@ -459,7 +465,8 @@
{
{
type
:
'
webhttp
'
,
type
:
'
webhttp
'
,
url
:
item
.
doc
.
url
.
replace
(
'
jio_private
'
,
'
private
'
),
url
:
item
.
doc
.
url
.
replace
(
'
jio_private
'
,
'
private
'
),
basic_login
:
basic_login
basic_login
:
basic_login
,
timeout
:
context
.
_request_timeout
},
},
id_hash
id_hash
));
));
...
@@ -701,7 +708,8 @@
...
@@ -701,7 +708,8 @@
attachment_id
:
'
enclosure
'
,
attachment_id
:
'
enclosure
'
,
parser
:
'
opml
'
,
parser
:
'
opml
'
,
sub_storage
:
{
sub_storage
:
{
type
:
"
http
"
type
:
"
http
"
,
timeout
:
context
.
_request_timeout
}
}
},
},
storage_spec
.
basic_login
storage_spec
.
basic_login
...
...
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_storage_js.xml
View file @
17c390c7
...
@@ -239,7 +239,7 @@
...
@@ -239,7 +239,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
3.31914.46636.11724
</string>
</value>
<value>
<string>
96
4.6864.64042.34201
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -257,7 +257,7 @@
...
@@ -257,7 +257,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
151
0928894.69
</float>
<float>
151
3173747.08
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_web_storage_js.js
View file @
17c390c7
...
@@ -27,6 +27,9 @@
...
@@ -27,6 +27,9 @@
}
}
options
.
xhrFields
.
withCredentials
=
storage
.
_with_credentials
;
options
.
xhrFields
.
withCredentials
=
storage
.
_with_credentials
;
}
}
if
(
storage
.
_timeout
!==
undefined
)
{
options
.
timeout
=
storage
.
_timeout
;
}
return
new
RSVP
.
Queue
()
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
.
push
(
function
()
{
return
jIO
.
util
.
ajax
(
options
);
return
jIO
.
util
.
ajax
(
options
);
...
@@ -81,6 +84,7 @@
...
@@ -81,6 +84,7 @@
this
.
_authorization
=
"
Basic
"
+
spec
.
basic_login
;
this
.
_authorization
=
"
Basic
"
+
spec
.
basic_login
;
}
}
this
.
_with_credentials
=
spec
.
with_credentials
;
this
.
_with_credentials
=
spec
.
with_credentials
;
this
.
_timeout
=
spec
.
timeout
;
}
}
WEBHTTPStorage
.
prototype
.
get
=
function
(
id
)
{
WEBHTTPStorage
.
prototype
.
get
=
function
(
id
)
{
...
...
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_web_storage_js.xml
View file @
17c390c7
...
@@ -242,7 +242,7 @@
...
@@ -242,7 +242,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
1.21931.50854.43776
</string>
</value>
<value>
<string>
96
3.27666.8050.30907
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -260,7 +260,7 @@
...
@@ -260,7 +260,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
02445069.19
</float>
<float>
15
13173954.77
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment