Logging part of configuration and javascript depends hosted

lamefox · Jun 6, 2014 · 132f8fd · 132f8fd
1 parent ac9583b
commit 132f8fd
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 31 deletions.
diff --git a/WatchyServer/BackendUtil.py b/WatchyServer/BackendUtil.py
@@ -54,6 +54,7 @@ def run (self):
                 for i in self.backends:
                     i.consume (data)
             except Queue.Empty:
+                # sleep to stop spamming the process
                 time.sleep (1)
             except:
                 ServerUtil.error ("%s" % traceback.format_exc ())

diff --git a/WatchyServer/StatsServer.py b/WatchyServer/StatsServer.py
@@ -76,10 +76,9 @@ def statics (path):
 
 class WatchyDServer:
     def __init__ (self, cacheLimit, backends, wbind='localhost', wport=8080,
-                  ubind='localhost', uport=8081, debug=False):
+                  ubind='localhost', uport=8081):
         self.web_bind = wbind
         self.web_port = wport
-        self.debug = debug
         self.udp_server = UDPStatsServer (host=ubind, port=uport,
                                           climit=cacheLimit, backends=backends)
 

diff --git a/WatchyServer/static/css/bootstrap.min.css b/WatchyServer/static/css/bootstrap.min.css
diff --git a/WatchyServer/static/js/bootstrap.min.js b/WatchyServer/static/js/bootstrap.min.js
diff --git a/WatchyServer/static/js/jquery.flot.min.js b/WatchyServer/static/js/jquery.flot.min.js
diff --git a/WatchyServer/static/js/jquery.flot.time.min.js b/WatchyServer/static/js/jquery.flot.time.min.js
diff --git a/WatchyServer/static/js/jquery.min.js b/WatchyServer/static/js/jquery.min.js
diff --git a/WatchyServer/templates/graph.html b/WatchyServer/templates/graph.html
@@ -6,13 +6,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Stats Node {{ node }}</title>
 
-    <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/deps/css/bootstrap.min.css" rel="stylesheet">
     <link href="/deps/css/index.css" rel="stylesheet" type="text/css">
     <link href="/deps/css/graph.css" rel="stylesheet" type="text/css">
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/flot/0.8.2/jquery.flot.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/flot/0.8.2/jquery.flot.time.min.js"></script>
+
+    <script src="/deps/js/jquery.min.js"></script>
+    <script src="/deps/js/bootstrap.min.js"></script>
+    <script src="/deps/js/jquery.flot.min.js"></script>
+    <script src="/deps/js/jquery.flot.time.min.js"></script>
 
     <script type="text/javascript">
      $(function () {

diff --git a/WatchyServer/templates/index.html b/WatchyServer/templates/index.html
@@ -6,11 +6,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Watchy Dashboard</title>
 
-    <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
-    <link href="deps/css/index.css" rel="stylesheet" type="text/css">
-
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+    <link href="/deps/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/deps/css/index.css" rel="stylesheet" type="text/css">
+    <script src="/deps/js/jquery.min.js"></script>
+    <script src="/deps/js/bootstrap.min.js"></script>
 
     <script type="text/javascript">
      $(function() {

diff --git a/WatchyServer/templates/logs.html b/WatchyServer/templates/logs.html
@@ -6,11 +6,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Stats Node {{ node }}</title>
 
-    <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/deps/css/bootstrap.min.css" rel="stylesheet">
     <link href="/deps/css/index.css" rel="stylesheet" type="text/css">
     <link href="/deps/css/log.css" rel="stylesheet" type="text/css">
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+
+    <script src="/deps/js/jquery.min.js"></script>
+    <script src="/deps/js/bootstrap.min.js"></script>
 
     <script type="text/javascript">
      $(function () {

diff --git a/etc/watchy/example-watchy.cfg b/etc/watchy/example-watchy.cfg
@@ -12,3 +12,25 @@ uri = amqp://guest:guest@localhost:5672/%2F
 [mongo]
 type = mongodb
 uri = mongodb://localhost:27017
+
+[loggers]
+keys=root
+
+[handlers]
+keys=consoleHandler
+
+[formatters]
+keys=simpleFormatter
+
+[logger_root]
+level=DEBUG
+handlers=consoleHandler
+
+[handler_consoleHandler]
+class=StreamHandler
+level=DEBUG
+formatter=simpleFormatter
+args=(sys.stdout,)
+
+[formatter_simpleFormatter]
+format=WATCHY %(levelname)s - %(message)s
diff --git a/watchy.py b/watchy.py
@@ -5,6 +5,7 @@
 import logging
 import optparse
 import traceback
+import logging.config
 
 from WatchyServer import ServerUtil
 from WatchyServer import StatsServer
@@ -26,10 +27,6 @@ def serverMain ():
                        help="Config file location", default=None)
     parser.add_option ("-F", "--fork", dest="fork", action="store_true",
                        help="Fork as daemon", default=False)
-    parser.add_option ("-N", "--name", dest="name",
-                       help="Logging name", default="WATCHY")
-    parser.add_option ("-d", "--debug", dest="debug", action="store_true",
-                       help="Verbose Debugging on of off", default=False)
     (options, args) = parser.parse_args ()
     if options.version is True:
         printVersion ()
@@ -61,6 +58,7 @@ def serverMain ():
         except BackendUtil.BackendInitException:
             print >> sys.stderr, "Error intilizing backend %s" % sys.exc_info ()[1]
             sys.exit (-1)
+    logging.config.fileConfig (options.config)
     if options.fork is True:
         pid = os.fork ()
         if pid == -1:
@@ -72,19 +70,8 @@ def serverMain ():
         else:
             print pid
             sys.exit (0)
-    form = '[' + options.name + '] %(levelname)s %(message)s'
-    level = logging.DEBUG if options.debug else logging.INFO
-    logging.basicConfig (filename = options.logfile, level = level, format = form,
-                         datefmt = '%m/%d/%Y %I:%M:%S', filemode = 'w+')
-    if options.debug is True:
-        rootLogger = logging.getLogger ()
-        consoleHandler = logging.StreamHandler ()
-        formatter = logging.Formatter (form)
-        consoleHandler.setFormatter (formatter)
-        rootLogger.addHandler (consoleHandler)
     StatsServer.WatchyDServer (limit, backends, wbind=rbind, wport=rport,
-                               ubind=abind, uport=aport,
-                               debug=options.debug).listen ()
+                               ubind=abind, uport=aport).listen ()
 
 if __name__ == "__main__":
     serverMain ()