From: Michael Tremer Date: Sun, 15 Sep 2024 04:53:37 +0000 (+0000) Subject: web: Drop the POST-based stats handler X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19c3cfcc70ae6c1394365c6c4bba6f5d3936cbef;p=pbs.git web: Drop the POST-based stats handler Signed-off-by: Michael Tremer --- diff --git a/src/web/__init__.py b/src/web/__init__.py index ab0d5920..667f1062 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -202,7 +202,6 @@ class Application(tornado.web.Application): (r"/builders/([A-Za-z0-9\-\.]+)/stats", builders.StatsHandler), (r"/builders/([A-Za-z0-9\-\.]+)/stop", builders.StopHandler), (r"/api/v1/builders/control", builders.APIv1ControlHandler), - (r"/api/v1/builders/stats", builders.APIv1StatsHandler), # Distributions (r"/distros", distributions.IndexHandler), diff --git a/src/web/builders.py b/src/web/builders.py index fa11c644..244c440b 100644 --- a/src/web/builders.py +++ b/src/web/builders.py @@ -54,62 +54,6 @@ class APIv1ControlHandler(base.APIMixin, base.BackendMixin, tornado.websocket.We await self.builder.log_stats(**data) -class APIv1StatsHandler(base.APIMixin, base.BaseHandler): - @base.negotiate - async def post(self): - stats = { - # CPU info - "cpu_model" : self.get_argument("cpu_model"), - "cpu_count" : self.get_argument_int("cpu_count"), - "cpu_arch" : self.get_argument("cpu_arch"), - - # Pakfire Version - "pakfire_version" : self.get_argument("pakfire_version"), - - # OS - "os_name" : self.get_argument("os_name"), - - # CPU stats - "cpu_user" : self.get_argument_float("cpu_user"), - "cpu_nice" : self.get_argument_float("cpu_nice"), - "cpu_system" : self.get_argument_float("cpu_system"), - "cpu_idle" : self.get_argument_float("cpu_idle"), - "cpu_iowait" : self.get_argument_float("cpu_iowait"), - "cpu_irq" : self.get_argument_float("cpu_irq"), - "cpu_softirq" : self.get_argument_float("cpu_softirq"), - "cpu_steal" : self.get_argument_float("cpu_steal"), - "cpu_guest" : self.get_argument_float("cpu_guest"), - "cpu_guest_nice" : self.get_argument_float("cpu_guest_nice"), - - # Load Average - "loadavg1" : self.get_argument_float("loadavg1"), - "loadavg5" : self.get_argument_float("loadavg5"), - "loadavg15" : self.get_argument_float("loadavg15"), - - # Memory - "mem_total" : self.get_argument_int("mem_total"), - "mem_available" : self.get_argument_int("mem_available"), - "mem_used" : self.get_argument_int("mem_used"), - "mem_free" : self.get_argument_int("mem_free"), - "mem_active" : self.get_argument_int("mem_active"), - "mem_inactive" : self.get_argument_int("mem_inactive"), - "mem_buffers" : self.get_argument_int("mem_buffers"), - "mem_cached" : self.get_argument_int("mem_cached"), - "mem_shared" : self.get_argument_int("mem_shared"), - - # Swap - "swap_total" : self.get_argument_int("swap_total"), - "swap_used" : self.get_argument_int("swap_used"), - "swap_free" : self.get_argument_int("swap_free"), - } - - with self.db.transaction(): - await self.builder.log_stats(**stats) - - # Send OK - self.finish({}) - - class StatsHandler(base.BaseHandler, tornado.websocket.WebSocketHandler): # No authentication required async def open(self, name):