This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository mum. See http://git.chorem.org/mum.git commit 856c7dee5a0bd6eaf9485dda4ec431201d1ec114 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Mon Mar 16 09:43:01 2015 +0100 correction structure templates --- app/app.py | 2 +- app/modules/storage_modules/shelve_db.py | 44 ++++++++++++++++++-------------- views/hostpage.html | 3 ++- views/index.html | 12 +++++---- views/notifications.html | 40 ++++++++++++++--------------- views/profile.html | 4 +-- views/scan.html | 3 --- views/settings.html | 4 +-- 8 files changed, 56 insertions(+), 56 deletions(-) diff --git a/app/app.py b/app/app.py index a7f4962..8ffda84 100755 --- a/app/app.py +++ b/app/app.py @@ -179,6 +179,6 @@ if __name__ == '__main__': wsc = WebSocketContainer(ml.get_db()) process_monitoring.init(ml, wsc) port = int(os.environ.get('PORT', 1337)) - run(host='0.0.0.0', port=port, server=GeventWebSocketServer) + run(host='0.0.0.0', port=port, debug=True, server=GeventWebSocketServer) # after ending process_monitoring.end = True diff --git a/app/modules/storage_modules/shelve_db.py b/app/modules/storage_modules/shelve_db.py index 4e2f75e..d03b7c3 100644 --- a/app/modules/storage_modules/shelve_db.py +++ b/app/modules/storage_modules/shelve_db.py @@ -346,25 +346,31 @@ class shelve_db: Get every informations necessary for the hostpage summary page. :param addr_host: the IP address of the host :return: informations concerning this host on the form : - { - 'host_name': val, - 'monitoring':{ - mod_name:{ - 'state':val, - 'value':val, - 'unit':val, - 'last_check':date - } - } - 'activated_monitoring':{ - mod_name: bool - } - 'detection':{ - mod_name:res - } - 'custom_info';val - 'interventions':list - } + { + "interventions":list, + "detected": + { + modname: + { + key:val, + ... + } + } + "hostname":val, + "monitoring": + { + modname: + { + "date":val, + "state":val, + "value":val + } + }, + 'activated_monitoring':{ + mod_name: bool + }, + "custom_infos":val + } """ self.open_db() res = {} diff --git a/views/hostpage.html b/views/hostpage.html index 31f2734..e89aea9 100644 --- a/views/hostpage.html +++ b/views/hostpage.html @@ -396,4 +396,5 @@ </div> </div> </div> - --> \ No newline at end of file + --> + </div> \ No newline at end of file diff --git a/views/index.html b/views/index.html index 1bb2ed5..f273638 100644 --- a/views/index.html +++ b/views/index.html @@ -80,11 +80,13 @@ <div id="main"> <div ng-view></div> </div> - <!-- Bootstrap core JavaScript - ================================================== --> - <!-- Placed at the end of the document so the pages load faster - <script src="bower_components/jquery/dist/jquery.min.js"></script> - <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>--> + <!-- Bootstrap core JavaScript + ================================================== --> + <!-- Placed at the end of the document so the pages load faster + <script src="bower_components/jquery/dist/jquery.min.js"></script> + <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>--> + </div> + </div> </body> </html> diff --git a/views/notifications.html b/views/notifications.html index 6b25851..172e172 100644 --- a/views/notifications.html +++ b/views/notifications.html @@ -153,28 +153,26 @@ <button type="button" class="btn btn-default">Discard changes</button> <button type="button" class="btn btn-primary">Save changes</button> </div> - </div> -</div> -<div class="modal fade" id="modal_add" tabindex="-1" role="dialog" aria-labelledby="modal_add_label" aria-hidden="true"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> - <h4 class="modal-title" id="modal_add_label">Add users to this group/host</h4> - </div> - <div class="modal-body"> - <select multiple class="form-control"> - <option>D.D.</option> - <option>J.D.</option> - <option>X.R.</option> - </select> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> - <button type="button" class="btn btn-primary">Add selected</button> + <div class="modal fade" id="modal_add" tabindex="-1" role="dialog" aria-labelledby="modal_add_label" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> + <h4 class="modal-title" id="modal_add_label">Add users to this group/host</h4> + </div> + <div class="modal-body"> + <select multiple class="form-control"> + <option>D.D.</option> + <option>J.D.</option> + <option>X.R.</option> + </select> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> + <button type="button" class="btn btn-primary">Add selected</button> + </div> + </div> </div> </div> - </div> -</div> diff --git a/views/profile.html b/views/profile.html index cf30c2a..df1c645 100644 --- a/views/profile.html +++ b/views/profile.html @@ -113,6 +113,4 @@ </tr> </tbody> </table> - </div> - </div> -</div> + </div> \ No newline at end of file diff --git a/views/scan.html b/views/scan.html index 53e22f1..4eb2162 100644 --- a/views/scan.html +++ b/views/scan.html @@ -15,6 +15,3 @@ <p>Scanned IP : {{ip_scanned}}</p> </div> </div> - </div> - </div> - diff --git a/views/settings.html b/views/settings.html index 6ab4301..bfcd86a 100644 --- a/views/settings.html +++ b/views/settings.html @@ -142,6 +142,4 @@ <button type="button" class="btn btn-primary">Save changes</button> </form> - </div> - </div> - </div> + </div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.