Browse Source

removed application specific naming convention.

Signed-off-by: Nicholas Tan Jerome <nicholas.jerome@kit.edu>
Nicholas Tan Jerome 6 years ago
parent
commit
5e6708639f
2 changed files with 13 additions and 14 deletions
  1. 12 13
      core.py
  2. 1 1
      status.html

+ 12 - 13
core.py

@@ -455,19 +455,18 @@ print "Running..."
 rt = RepeatedTimer(int(os.environ["BORA_POLLING"]), fetchDataADEI)
 
 application = tornado.web.Application([
-    (r"/"+os.environ["BORA_TITLE"].lower()+"/version/?", VersionHandler),
-    (r"/"+os.environ["BORA_TITLE"].lower()+"/list/?", ListHandler),
-    (r"/"+os.environ["BORA_TITLE"].lower()+"/start/?", StartHandler),
-    (r"/"+os.environ["BORA_TITLE"].lower()+"/backup/?", BackupHandler),
-    (r"/"+os.environ["BORA_TITLE"].lower()+"/stop/?", StopHandler),
-    (r"/"+os.environ["BORA_TITLE"].lower()+"/designer/?", DesignerHandler),
-    (r"/"+os.environ["BORA_TITLE"].lower()+"/status/?", StatusHandler),
-    (r"/"+os.environ["BORA_TITLE"].lower()+"/save/?", SaveHandler),
-    (r"/"+os.environ["BORA_TITLE"].lower()+"/update/?", UpdateHandler),
-    (r"/"+os.environ["BORA_TITLE"].lower()+"/getdata/?", GetDataHandler),
-    (r"/"+os.environ["BORA_TITLE"].lower()+"/timer/(?P<duration>[^\/]+)/?",
-     SetTimerHandler),
-    (r"/"+os.environ["BORA_TITLE"].lower()+"/add/(?P<db_server>[^\/]+)/?"
+    (r"/version/?", VersionHandler),
+    (r"/list/?", ListHandler),
+    (r"/start/?", StartHandler),
+    (r"/backup/?", BackupHandler),
+    (r"/stop/?", StopHandler),
+    (r"/designer/?", DesignerHandler),
+    (r"/status/?", StatusHandler),
+    (r"/save/?", SaveHandler),
+    (r"/update/?", UpdateHandler),
+    (r"/getdata/?", GetDataHandler),
+    (r"/timer/(?P<duration>[^\/]+)/?", SetTimerHandler),
+    (r"/add/(?P<db_server>[^\/]+)/?"
      "(?P<db_name>[^\/]+)/?(?P<db_group>[^\/]+)/?(?P<sensor_name>[^\/]+)?",
      AdeiKatrinHandler)
 ], debug=True, static_path=os.path.join(root, 'static'),

+ 1 - 1
status.html

@@ -578,7 +578,7 @@ var myVar = setInterval(myTimer, 10000);
 function myTimer() {
     var dataToSend = {};
     $.ajax({
-        url: '/'+$("#page_title_cache").text().toLowerCase()+'/getdata/',
+        url: '/getdata/',
         //url: '/wgts/getabcddata/',
         type: 'GET',
         data: dataToSend,