diff --git a/appmanage/api/service/manage.py b/appmanage/api/service/manage.py index 2b171028..b02504c5 100644 --- a/appmanage/api/service/manage.py +++ b/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 diff --git a/appmanage/api/settings/settings.py b/appmanage/api/settings/settings.py index a0f32c66..449f2c23 100644 --- a/appmanage/api/settings/settings.py +++ b/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 diff --git a/appmanage/api/utils/docker.py b/appmanage/api/utils/docker.py index bae2901e..bca2b28a 100644 --- a/appmanage/api/utils/docker.py +++ b/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 diff --git a/appmanage/api/utils/files.py b/appmanage/api/utils/files.py index 9735006b..53eed1e7 100644 --- a/appmanage/api/utils/files.py +++ b/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 \ No newline at end of file +# src: path | URL diff --git a/appmanage/api/utils/common_log.py b/appmanage/api/utils/log.py similarity index 100% rename from appmanage/api/utils/common_log.py rename to appmanage/api/utils/log.py diff --git a/appmanage/api/utils/nginx.py b/appmanage/api/utils/nginx.py index e2ee711b..a7aa29a2 100644 --- a/appmanage/api/utils/nginx.py +++ b/appmanage/api/utils/nginx.py @@ -1 +1 @@ -# connect Nginx Proxy Manager and executive API commands \ No newline at end of file +# connect Nginx Proxy Manager and executive API endpoint \ No newline at end of file diff --git a/appmanage/api/utils/shell_execute.py b/appmanage/api/utils/shell_execute.py index 7e7057a7..7aa7a2ee 100644 --- a/appmanage/api/utils/shell_execute.py +++ b/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 diff --git a/appmanage/api/v1/routers/apps.py b/appmanage/api/v1/routers/apps.py index 52a81bc0..61f377b5 100644 --- a/appmanage/api/v1/routers/apps.py +++ b/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 diff --git a/appmanage/create.sql b/appmanage/create.sql new file mode 100644 index 00000000..e69de29b diff --git a/appmanage/hostname.py b/appmanage/hostname.py index 7fff95e2..8a005a0e 100644 --- a/appmanage/hostname.py +++ b/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") \ No newline at end of file +shell_execute.execute_command_output_all("echo $(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' websoft9-appmanage) websoft9-appmanage >> /etc/hosts") diff --git a/appmanage/main.py b/appmanage/main.py index 838b0c36..33000e6b 100644 --- a/appmanage/main.py +++ b/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) \ No newline at end of file + uvicorn.run("main:get_app", host='0.0.0.0', port=args.port, reload=True)