Change route and default value for server_name

Kozea · Feb 23, 2018 · ac70d0e · ac70d0e
1 parent 77ac5b8
commit ac70d0e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/sherlog/app.py b/sherlog/app.py
@@ -16,6 +16,8 @@ def __init__(self, *args, **kwargs):
 
  self.route('/graph/<server_name>/<ping_service>',
  methods=['GET', 'POST'])(get_graph)
+ self.route('/graph/<ping_service>',
+ methods=['GET', 'POST'])(get_graph)
 
  rest = UnRest(self, self.create_session())
  rest(Log, methods=['GET'])
@@ -27,7 +29,7 @@ def before(self):
  g.session = self.create_session()
 
 
-def get_graph(server_name, ping_service):
+def get_graph(ping_service, server_name=''):
  graph.build_graph(server_name, ping_service)
 
 

diff --git a/sherlog/graph.py b/sherlog/graph.py
@@ -49,7 +49,7 @@ def get_data(server_name, ping_service, start):
  else:
  data = (
  dbsession.query(Log)
- .filter(Log.server_name == server_name)
+ .filter(Log.host == ping_service)
  .filter(Log.command == '')
  .filter(Log.start > start)
  .all()
@@ -73,4 +73,4 @@ def build_graph(server_name, ping_service):
  group = list(group)
  data.append(float(compute_ok_percent(group, len(group))))
  data_range.append(key)
- return gen_graph(data, data_range, server_name + ping_service)
+ gen_graph(data, data_range, server_name + ping_service)