Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Klaus Wölfel
slapos.core
Commits
b3b9da61
Commit
b3b9da61
authored
Jun 30, 2016
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_monitoring: fix compatibility with previous version on sync
parent
618653c9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
6 deletions
+21
-6
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_appcache.xml
...mplateItem/web_page_module/gadget_monitoring_appcache.xml
+3
-3
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_sync_js.html
...mplateItem/web_page_module/gadget_monitoring_sync_js.html
+16
-1
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_sync_js.xml
...emplateItem/web_page_module/gadget_monitoring_sync_js.xml
+2
-2
No files found.
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_appcache.xml
View file @
b3b9da61
...
...
@@ -107,7 +107,7 @@
<value>
<string
encoding=
"cdata"
>
<![CDATA[
CACHE MANIFEST\n
# generated on Fri, 30 June 2016 1
5
:47:33 +0000\n
# generated on Fri, 30 June 2016 1
7
:47:33 +0000\n
# XXX + fonts\n
# images/ajax-loader.gif\n
CACHE:\n
...
...
@@ -340,7 +340,7 @@ NETWORK:\n
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
952.141
59.59836.36932
</string>
</value>
<value>
<string>
952.141
60.36945.51916
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -358,7 +358,7 @@ NETWORK:\n
</tuple>
<state>
<tuple>
<float>
14672
80353.76
</float>
<float>
14672
99069.5
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_sync_js.html
View file @
b3b9da61
...
...
@@ -143,6 +143,20 @@
return
gadget
.
props
.
jio_gadget
.
getUrlFeedDescription
(
options
.
query
);
})
.
push
(
function
(
url_list
)
{
if
(
url_list
.
length
<=
0
)
{
//
For
backward
compatibility
,
sync
OMPL
if
there
are
empty
!
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
return
gadget
.
props
.
jio_gadget
.
syncMonitoringOpmlData
();
})
.
push
(
function
()
{
return
gadget
.
props
.
jio_gadget
.
getUrlFeedDescription
(
options
.
query
);
});
}
else
{
return
url_list
;
}
})
.
push
(
function
(
url_list
)
{
var
i
,
promise_list =
[];
...
...
@@ -267,7 +281,8 @@
})
.push(function (timer_interval) {
if (timer_interval === undefined) {
timer_interval = 300000;
// quickly sync because this is the first run!
timer_interval = 10000;
}
gadget.props.timer_interval = timer_interval;
return gadget.getSetting('latest_sync_time');
...
...
master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_sync_js.xml
View file @
b3b9da61
...
...
@@ -242,7 +242,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
95
1.28267.48379.7065
</string>
</value>
<value>
<string>
95
2.14470.40610.22152
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>
146
6610249.05
</float>
<float>
146
7299177.03
</float>
<string>
UTC
</string>
</tuple>
</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