Merge pull request #315 from Websoft9/temp_branch

temp commit

appmanage/api/service/manage.py

@@ -18,7 +18,7 @@ from api.service import db
 from api.model.response import Response
 from api.model.config import Config
 from api.model.status_reason import StatusReason
-from api.utils.common_log import myLogger
+from api.utils.log import myLogger
 from redis import Redis
 from rq import Queue, Worker, Connection
 from rq.registry import StartedJobRegistry, FinishedJobRegistry, DeferredJobRegistry, FailedJobRegistry, ScheduledJobRegistry, CanceledJobRegistry

appmanage/api/settings/settings.py

@@ -1,4 +1,4 @@
-from api.utils.common_log import myLogger
+from api.utils.log import myLogger
 from api.utils.helper import Singleton
 
 

appmanage/api/utils/docker.py

@@ -4,7 +4,7 @@ from api.utils import shell_execute
 from dotenv import load_dotenv, find_dotenv
 import dotenv
 from pathlib import Path
-from api.utils.common_log import myLogger
+from api.utils.log import myLogger
 from api.utils import shell_execute, const
 from api.exception.command_exception import CommandException
 from api.service import manage

appmanage/api/utils/files.py

@@ -1,4 +1,4 @@
-from api.utils.common_log import myLogger
+from api.utils.log import myLogger
 from api.utils.helper import Singleton
 
 
@@ -66,4 +66,4 @@ class SettingsFile(object):
             
 
 # This class is add/modify/cat/delete content from file
-# src: path | URL
+# src: path | URL

appmanage/api/utils/nginx.py

@@ -1 +1 @@
-# connect Nginx Proxy Manager and executive API commands
+# connect Nginx Proxy Manager and executive API endpoint

appmanage/api/utils/shell_execute.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 import os, io, sys, platform, shutil, time, subprocess, json, datetime
-from api.utils.common_log import myLogger
+from api.utils.log import myLogger
 from api.exception.command_exception import CommandException
 from api.utils import const
 

appmanage/api/v1/routers/apps.py

@@ -9,7 +9,7 @@ from api.model.app import App
 from api.model.response import Response
 from api.service import manage, db
 from api.utils import shell_execute, const
-from api.utils.common_log import myLogger
+from api.utils.log import myLogger
 from api.exception.command_exception import CommandException
 from api.settings.settings import settings
 

appmanage/hostname.py

@@ -1,5 +1,5 @@
-from api.utils.common_log import myLogger
+from api.utils.log import myLogger
 from api.utils import shell_execute
 
 shell_execute.execute_command_output_all("sed -i '/websoft9-appmanage/d' /etc/hosts")
-shell_execute.execute_command_output_all("echo $(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' websoft9-appmanage) websoft9-appmanage >> /etc/hosts")
+shell_execute.execute_command_output_all("echo $(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' websoft9-appmanage) websoft9-appmanage >> /etc/hosts")

appmanage/main.py

@@ -12,7 +12,7 @@ from fastapi.openapi.docs import (
 
 import api.v1.api as api_router_v1
 
-from api.utils.common_log import myLogger
+from api.utils.log import myLogger
 from api.utils import shell_execute
 from api.settings.settings import settings
 
@@ -66,4 +66,4 @@ if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='websoft9')
     parser.add_argument("--port", type=int, dest='port', default=5000, metavar="port")
     args = parser.parse_args()
-    uvicorn.run("main:get_app", host='0.0.0.0', port=args.port, reload=True)
+    uvicorn.run("main:get_app", host='0.0.0.0', port=args.port, reload=True)