updated dashboard build and added metrics demo

OxygenFramework · Jan 11, 2024 · 385cdbc · 385cdbc
1 parent 9f6e535
commit 385cdbc
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 14 deletions.
diff --git a/data/dashboard/asset-manifest.json b/data/dashboard/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/df9a0d86-3283-4920-82dc-4555fc0d1d8b/static/css/main.1e415bb7.css",
-    "main.js": "/df9a0d86-3283-4920-82dc-4555fc0d1d8b/static/js/main.ab64643f.js",
+    "main.js": "/df9a0d86-3283-4920-82dc-4555fc0d1d8b/static/js/main.065fe6b4.js",
     "static/media/signInImage.png": "/df9a0d86-3283-4920-82dc-4555fc0d1d8b/static/media/signInImage.eeb0c777f5867442d1a2.png",
     "static/media/BgSignUp.png": "/df9a0d86-3283-4920-82dc-4555fc0d1d8b/static/media/BgSignUp.2dea4acf779bbfe49e5c.png",
     "static/media/roboto-all-500-normal.woff": "/df9a0d86-3283-4920-82dc-4555fc0d1d8b/static/media/roboto-all-500-normal.0ab669b7a0d19b178f57.woff",
@@ -33,6 +33,6 @@
   },
   "entrypoints": [
     "static/css/main.1e415bb7.css",
-    "static/js/main.ab64643f.js"
+    "static/js/main.065fe6b4.js"
   ]
 }
diff --git a/data/dashboard/index.html b/data/dashboard/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en" dir="ltr"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/manifest.json"/><link rel="shortcut icon" href="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/favicon.ico"/><link rel="apple-touch-icon" sizes="76x76" href="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/apple-icon.png"/><title>Oxygen Metrics</title><script defer="defer" src="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/static/js/main.ab64643f.js"></script><link href="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/static/css/main.1e415bb7.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en" dir="ltr"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/manifest.json"/><link rel="shortcut icon" href="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/favicon.ico"/><link rel="apple-touch-icon" sizes="76x76" href="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/apple-icon.png"/><title>Oxygen Metrics</title><script defer="defer" src="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/static/js/main.065fe6b4.js"></script><link href="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/static/css/main.1e415bb7.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/data/dashboard/static/js/main.ab64643f.js → data/dashboard/static/js/main.065fe6b4.js b/data/dashboard/static/js/main.ab64643f.js → data/dashboard/static/js/main.065fe6b4.js
diff --git a/...rd/static/js/main.ab64643f.js.LICENSE.txt → ...rd/static/js/main.065fe6b4.js.LICENSE.txt b/...rd/static/js/main.ab64643f.js.LICENSE.txt → ...rd/static/js/main.065fe6b4.js.LICENSE.txt
diff --git a/demo/metricsdemo.jl b/demo/metricsdemo.jl
@@ -0,0 +1,29 @@
+module CronManagementDemo 
+
+include("../src/Oxygen.jl")
+using .Oxygen
+using HTTP
+using Dates
+
+get("/data") do
+    Dict("msg" => "hello")
+end
+
+get("/random/sm") do
+    sleep(rand(0.1:0.30))
+    "small random"
+end
+
+get("/random/md") do
+    sleep(rand(0.30:0.70))
+    "small random"
+end
+
+get("/random/lg") do
+    sleep(rand(0.30:1))
+    "random"
+end
+
+serve()
+
+end
diff --git a/demo/util/api_tester.jl b/demo/util/api_tester.jl
@@ -38,12 +38,32 @@ urls = [
     "http://localhost:8080/data",
     "http://localhost:8080/data", 
     "http://localhost:8080/data",  
-    "http://localhost:8080/long", 
-    # "http://localhost:8080/error",
-    # "http://localhost:8080/fake",
-    "http://localhost:8080/hello", 
-    "http://localhost:8080/hello", 
-    "http://localhost:8080/hello", 
+    "http://localhost:8080/data",
+    "http://localhost:8080/data", 
+    "http://localhost:8080/data", 
+    "http://localhost:8080/data",
+    "http://localhost:8080/data", 
+    "http://localhost:8080/data",
+
+    "http://localhost:8080/random/lg", 
+    "http://localhost:8080/random/lg", 
+    "http://localhost:8080/random/lg", 
+
+    "http://localhost:8080/random/md", 
+    "http://localhost:8080/random/md", 
+    "http://localhost:8080/random/md", 
+    "http://localhost:8080/random/md", 
+
+    "http://localhost:8080/random/sm", 
+    "http://localhost:8080/random/sm", 
+    "http://localhost:8080/random/sm", 
+    "http://localhost:8080/random/sm", 
+    "http://localhost:8080/random/sm", 
+    "http://localhost:8080/random/sm", 
+
+    "http://localhost:8080/fake",
+    "http://localhost:8080/error",
+    "http://localhost:8080/nothing",
 ]
 random_requester(urls, (1, 8))  # Randomly hit endpoints between 1 and 5 requests per second
 

diff --git a/src/core.jl b/src/core.jl
@@ -402,7 +402,7 @@ function MetricsMiddleware(catch_errors::Bool)
                     # Handle the request
                     response = handler(req)
                     # Log response time
-                    response_time = time() - start_time
+                    response_time = (time() - start_time) * 1000
                     if response.status == 200
                         push_history(HTTPTransaction(
                             string(req.context[:ip]),
@@ -428,7 +428,7 @@ function MetricsMiddleware(catch_errors::Bool)
                     # Return the response
                     return response
                 catch e
-                    response_time = time() - start_time
+                    response_time = (time() - start_time) * 1000
 
                     # Log the error
                     push_history(HTTPTransaction(
@@ -681,7 +681,7 @@ end
 
 # add the swagger and swagger/schema routes 
 function setupswagger()
-    
+
     if isdocsenabled()
 
         @get "$docspath" function()
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en" dir="ltr"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/manifest.json"/><link rel="shortcut icon" href="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/favicon.ico"/><link rel="apple-touch-icon" sizes="76x76" href="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/apple-icon.png"/><title>Oxygen Metrics</title><script defer="defer" src="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/static/js/main.ab64643f.js"></script><link href="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/static/css/main.1e415bb7.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
		<!doctype html><html lang="en" dir="ltr"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/manifest.json"/><link rel="shortcut icon" href="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/favicon.ico"/><link rel="apple-touch-icon" sizes="76x76" href="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/apple-icon.png"/><title>Oxygen Metrics</title><script defer="defer" src="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/static/js/main.065fe6b4.js"></script><link href="/df9a0d86-3283-4920-82dc-4555fc0d1d8b/static/css/main.1e415bb7.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>