From 5e366d0599e6a5cb3ba7885e02f09710d455f582 Mon Sep 17 00:00:00 2001 From: opi Date: Wed, 29 Jan 2014 18:32:22 +0100 Subject: [PATCH 1/3] Manage services and view logs. --- js/app.js | 63 +++++++++++++++++++++++++++++++++++++++++++ views/home.ms | 5 ++++ views/service_info.ms | 52 +++++++++++++++++++++++++++++++++++ views/service_list.ms | 27 +++++++++++++++++++ views/service_log.ms | 15 +++++++++++ 5 files changed, 162 insertions(+) create mode 100644 views/service_info.ms create mode 100644 views/service_list.ms create mode 100644 views/service_log.ms diff --git a/js/app.js b/js/app.js index b9f2a8fe..65a19652 100644 --- a/js/app.js +++ b/js/app.js @@ -494,6 +494,69 @@ app = Sammy('#main', function (sam) { c.redirect('#/apps/'+ c.params['app']); } }); + + /** + * Services + * + */ + + // All services status + sam.get('#/services', function (c) { + c.api('/service/status', function(data) { // ? + data2 = { 'services': [] } + $.each(data, function(k, v) { + v.name = k; + v.is_loaded = (v.loaded=='enabled') ? true : false; + v.is_running = (v.status=='running') ? true : false; + data2.services.push(v); + }); + c.view('service_list', data2); + }); + }); + + // Status & actions for a service + sam.get('#/services/:service', function (c) { + params = { 'names': c.params['service'] } + c.api('/service/status', function(data) { // ? + data2 = { 'service': data } + data2.service.name = c.params['service']; + data2.service.is_loaded = (data.loaded=='enabled') ? true : false; + data2.service.is_running = (data.status=='running') ? true : false; + + store.clear('slide'); + c.view('service_info', data2); + }, 'GET', params); + }); + + // Service log + sam.get('#/services/:service/log', function (c) { + params = { 'name': c.params['service'], 'number': 50 } + c.api('/service/log', function(data) { // ? + data2 = { 'logs': [], 'name': c.params['service'] } + $.each(data, function(k, v) { + data2.logs.push({name: k, log: v.join('\n')}); + }); + + store.clear('slide'); + c.view('service_log', data2); + }, 'GET', params); + }); + + // Enable/Disable & Start/Stop service + sam.get('#/services/:service/:action', function (c) { + if (confirm('Are you sure you want to '+ c.params['action'] +' '+ c.params['service'] +' ?')) { + params = { 'names': c.params['service'] } + c.api('/service/'+ c.params['action'], function(data) { + store.clear('slide'); + c.redirect('#/services/'+ c.params['service']); + }, 'GET', params); + } else { + store.clear('slide'); + c.redirect('#/services/'+ c.params['service']); + } + }); + + }); diff --git a/views/home.ms b/views/home.ms index b2668bea..cc63bc92 100644 --- a/views/home.ms +++ b/views/home.ms @@ -20,5 +20,10 @@
+ +

Services

+ +
+
diff --git a/views/service_info.ms b/views/service_info.ms new file mode 100644 index 00000000..5c5e76bd --- /dev/null +++ b/views/service_info.ms @@ -0,0 +1,52 @@ +
+ Services list +
+
+
{{service.name}}
+
+ +
+ +

Status

+ {{#service}} +
+ Loaded: + + {{loaded}} + +
+ Status: + + {{status}} + +
+ +
+ {{#is_loaded}} + + Disable + + {{/is_loaded}} + {{^is_loaded}} + + Enable + + {{/is_loaded}} + + {{#is_running}} + + Stop + + {{/is_running}} + {{^is_running}} + + Start + + {{/is_running}} + + Log + +
+ + {{/service}} +
\ No newline at end of file diff --git a/views/service_list.ms b/views/service_list.ms new file mode 100644 index 00000000..4cbe1c86 --- /dev/null +++ b/views/service_list.ms @@ -0,0 +1,27 @@ +
+ Menu +
+
+
Services
+
+ +
+{{#services}} + + +

{{name}}

+
+
+ Loaded: + + {{loaded}} + +
+ Status: + + {{status}} + +
+
+{{/services}} +
\ No newline at end of file diff --git a/views/service_log.ms b/views/service_log.ms new file mode 100644 index 00000000..8752d08b --- /dev/null +++ b/views/service_log.ms @@ -0,0 +1,15 @@ +
+ {{name}} +
+
+
{{name}} log
+
+ +
+ {{#logs}} +

{{name}}

+
+        {{log}}
+        
+ {{/logs}} +
\ No newline at end of file From bda9540a66e7d0ccc04d066e7a8e4ce82e418360 Mon Sep 17 00:00:00 2001 From: opi Date: Fri, 7 Feb 2014 17:30:29 +0100 Subject: [PATCH 2/3] Remove load info from list. --- views/service_list.ms | 5 ----- 1 file changed, 5 deletions(-) diff --git a/views/service_list.ms b/views/service_list.ms index 4cbe1c86..e9e47d09 100644 --- a/views/service_list.ms +++ b/views/service_list.ms @@ -12,11 +12,6 @@

{{name}}

- Loaded: - - {{loaded}} - -
Status: {{status}} From 6f6ed8d8d0ce7e52fea135cde96f9232d92597f9 Mon Sep 17 00:00:00 2001 From: opi Date: Fri, 7 Feb 2014 17:37:29 +0100 Subject: [PATCH 3/3] Rename 'loaded' info. --- views/service_info.ms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/service_info.ms b/views/service_info.ms index 5c5e76bd..6641ae82 100644 --- a/views/service_info.ms +++ b/views/service_info.ms @@ -10,7 +10,7 @@

Status

{{#service}}
- Loaded: + Start on boot: {{loaded}}