From 73ecb48113eb8d2a37cee89e3481415089867709 Mon Sep 17 00:00:00 2001 From: Alejandro Sirgo Rica Date: Thu, 8 Aug 2024 14:25:00 +0200 Subject: src: log without backtrace in not implemented functions Don't log a backtrace when a not implemented function is called in ogClient. Log a "Function not implemented" message. --- src/linux/ogOperations.py | 17 +++++++++-------- src/virtual/ogOperations.py | 4 ++-- src/windows/ogOperations.py | 17 +++++++++-------- 3 files changed, 20 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/linux/ogOperations.py b/src/linux/ogOperations.py index 63afd12..44684e9 100644 --- a/src/linux/ogOperations.py +++ b/src/linux/ogOperations.py @@ -9,13 +9,14 @@ import os import subprocess from subprocess import CalledProcessError +from src.log import OgError from src.ogRest import ThreadState class OgLinuxOperations: def _restartBrowser(self, url): - raise NotImplementedError + raise OgError('Function not implemented') def poweroff(self): os.system('systemctl poweroff') @@ -41,25 +42,25 @@ class OgLinuxOperations: return result.stdout def session(self, request, ogRest): - raise NotImplementedError + raise OgError('Function not implemented') def hardware(self, path, ogRest): - raise NotImplementedError + raise OgError('Function not implemented') def setup(self, request, ogRest): - raise NotImplementedError + raise OgError('Function not implemented') def image_restore(self, request, ogRest): - raise NotImplementedError + raise OgError('Function not implemented') def image_create(self, path, request, ogRest): - raise NotImplementedError + raise OgError('Function not implemented') def cache_delete(self, request, ogRest): - raise NotImplementedError + raise OgError('Function not implemented') def cache_fetch(self, request, ogRest): - raise NotImplementedError + raise OgError('Function not implemented') def refresh(self, ogRest): return {"status": "LINUX"} diff --git a/src/virtual/ogOperations.py b/src/virtual/ogOperations.py index c17bfb4..763c126 100644 --- a/src/virtual/ogOperations.py +++ b/src/virtual/ogOperations.py @@ -467,10 +467,10 @@ class OgVirtualOperations: return json_dict def cache_delete(self, request, ogRest): - raise NotImplementedError + raise OgError('Function not implemented') def cache_fetch(self, request, ogRest): - raise NotImplementedError + raise OgError('Function not implemented') def software(self, request, path, ogRest): DPKG_PATH = '/var/lib/dpkg/status' diff --git a/src/windows/ogOperations.py b/src/windows/ogOperations.py index 45413ba..5ac9c9f 100644 --- a/src/windows/ogOperations.py +++ b/src/windows/ogOperations.py @@ -12,6 +12,7 @@ import subprocess from subprocess import CalledProcessError import multiprocessing as mp from multiprocessing import Process, freeze_support +from src.log import OgError from PIL import Image, ImageDraw from pystray import Icon, Menu, MenuItem @@ -68,7 +69,7 @@ class OgWindowsOperations: systray_p.start() def _restartBrowser(self, url): - raise NotImplementedError + raise OgError('Function not implemented') def poweroff(self): systray_p.terminate() @@ -96,25 +97,25 @@ class OgWindowsOperations: return (result.returncode, cmd, result.stdout) def session(self, request, ogRest): - raise NotImplementedError + raise OgError('Function not implemented') def hardware(self, path, ogRest): - raise NotImplementedError + raise OgError('Function not implemented') def setup(self, request, ogRest): - raise NotImplementedError + raise OgError('Function not implemented') def image_restore(self, request, ogRest): - raise NotImplementedError + raise OgError('Function not implemented') def image_create(self, path, request, ogRest): - raise NotImplementedError + raise OgError('Function not implemented') def cache_delete(self, request, ogRest): - raise NotImplementedError + raise OgError('Function not implemented') def cache_fetch(self, request, ogRest): - raise NotImplementedError + raise OgError('Function not implemented') def refresh(self, ogRest): return {"status": "WIN"} -- cgit v1.2.3-18-g5258