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 933c34f8a9cf3946e60f7c3a0e6308f50b473dfc Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Thu Jun 18 11:51:15 2015 +0200 exception handled for notif mod --- app/module_loader.py | 5 +++++ views/dashboard.html | 19 ++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/app/module_loader.py b/app/module_loader.py index 17a2973..f818ffb 100644 --- a/app/module_loader.py +++ b/app/module_loader.py @@ -284,6 +284,7 @@ class ModuleLoader: except AttributeError: self.logger.warning("Error : external monitoring module " + mod_name + " could not have been loaded.") self.logger.debug(traceback.format_exc()) + print self.loaded_mod_moni def run_one_monitoring_module(self, part_name, addr_host): """ @@ -293,6 +294,7 @@ class ModuleLoader: :param part_name: the name of the part to check :param addr_host: the IP address of the host """ + print part_name if part_name in self.loaded_mod_moni[part_name]['modules'] and \ getattr(self.loaded_mod_moni[part_name]['modules'][part_name]['imported'], 'connection') == "": # the module which check this part doesn't need a connection @@ -516,6 +518,9 @@ class ModuleLoader: except KeyError: self.logger.warning('Missing setting for notification module ' + notif_mod) self.logger.debug(traceback.format_exc()) + except Exception: + self.logger.error('An error occured with notification module ' + self.loaded_mod_notif[notif_mod]['class_name']) + self.logger.error(traceback.format_exc()) def update_global_conf(self): """ diff --git a/views/dashboard.html b/views/dashboard.html index a0b7946..bd1091f 100644 --- a/views/dashboard.html +++ b/views/dashboard.html @@ -46,6 +46,21 @@ ng-model="group_filter" ng-options="group for group in allGroups() | unique:'group'"> </select> + <!--<ui-select multiple + tagging="tag_transform" + tagging-label="" + ng-model="group_filter" + theme="bootstrap" + sortable="true" + ng-disabled="disabled" + style="width: 300px;" + title="Group filter"> + <ui-select-match placeholder="Add to group...">{{$item}}</ui-select-match> + <ui-select-choices repeat="group in allGroups() | unique:'group' | filter:$select.search" + refresh-delay="0"> + {{group}} + </ui-select-choices> + </ui-select>--> </div> <table class="table table-condensed table-hover"> @@ -188,7 +203,9 @@ </p> </div> - <button type="button" class="btn btn-default" ng-click="open_modal_log()">See the logs...</button> + <div class="row"> + <button type="button" class="btn btn-default" ng-click="open_modal_log()">See the logs...</button> + </div> <script type="text/ng-template" id="modal_notif_label.html"> <div class="modal-header"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.