diff --git a/Dockerfile b/Dockerfile index 2681211..a1af72b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,15 +3,10 @@ FROM golang:latest AS go_builder WORKDIR /app -COPY ./backend/main /app/main -#COPY ./backend/grouptasks_lang_log_messages.json /app/ -#COPY ./backend/system_lang_log_messages.json /app/ -#COPY ./backend/public/swagger/ /app/swagger - -# Assuming you build your Go binary using "go build -o main" -#RUN go build -o main +COPY ./admin-dashboard-backend/main /app/main # Stage 2: Create the final image with Python 3 and the Go binary +# Python is needed for the group tasks FROM python:3 WORKDIR /app @@ -19,23 +14,9 @@ WORKDIR /app # Copy the Go binary from the previous stage COPY --from=go_builder /app/main /app/main -# Copy any other files you need -COPY ./backend/grouptasks_lang_log_messages.json /app/ -COPY ./backend/system_lang_log_messages.json /app/ -COPY ./backend/public/swagger/ /app/swagger +COPY ./admin-dashboard-backend/public/swagger/ /app/swagger # Set up any Python dependencies you might need # RUN pip install ... -CMD ["./main"] - -#FROM golang:latest - -#WORKDIR /app - -#COPY ./backend/main /app/main -#COPY ./backend/grouptasks_lang_log_messages.json /app/ -#COPY ./backend/system_lang_log_messages.json /app/ -#COPY ./backend/public/swagger/ /app/swagger - -#CMD ["./main"] \ No newline at end of file +CMD ["./main"] \ No newline at end of file diff --git a/main b/main index 1cea59f..38f6796 100755 Binary files a/main and b/main differ diff --git a/modules/config/config.go b/modules/config/config.go index 7d0aa71..b431dcb 100644 --- a/modules/config/config.go +++ b/modules/config/config.go @@ -10,13 +10,14 @@ import ( var Cfg Config type Config struct { - Debug bool - ColorizedOutput bool - Host string - Port string - FolderPaths FolderPaths - MariaDB MariaDB - InvexAPI InvexAPI + Debug bool + ColorizedOutput bool + Host string + Port string + LogManagerServerUrl string + FolderPaths FolderPaths + MariaDB MariaDB + InvexAPI InvexAPI } type FolderPaths struct { @@ -50,10 +51,11 @@ func LoadConfig() { } Cfg = Config{ - Debug: os.Getenv("DEBUG") == "true", - ColorizedOutput: os.Getenv("COLORIZED_OUTPUT") == "true", - Host: os.Getenv("HOST"), - Port: os.Getenv("PORT"), + Debug: os.Getenv("DEBUG") == "true", + ColorizedOutput: os.Getenv("COLORIZED_OUTPUT") == "true", + Host: os.Getenv("HOST"), + Port: os.Getenv("PORT"), + LogManagerServerUrl: os.Getenv("LOG_MANAGER_SERVER_URL"), FolderPaths: FolderPaths{ GroupTasksGroups: os.Getenv("FOLDER_GROUPTASKS_GROUPS"), GroupTasksRunningTasks: os.Getenv("FOLDER_GROUPTASKS_RUNNINGTASKS"), diff --git a/modules/logger/logger.go b/modules/logger/logger.go index d26c22a..3b99de2 100644 --- a/modules/logger/logger.go +++ b/modules/logger/logger.go @@ -12,9 +12,6 @@ import ( "github.com/rs/zerolog/log" ) -//var systemLanguageLogMessages []structs.LanguageLogMessages -//var grouptasksLanguageLogMessages []structs.LanguageLogMessages - func InitLogger() { zerolog.TimeFieldFormat = zerolog.TimeFormatUnix @@ -34,13 +31,13 @@ func getTime() string { } func AddSystemLog(format string, v ...any) { - go LogManagerRequestClient(fiber.MethodPost, "http://localhost:50110/v1/log", LogManagerRequestBody{ + go LogManagerRequestClient(fiber.MethodPost, config.Cfg.LogManagerServerUrl+"/v1/log", LogManagerRequestBody{ Type: "system", Logs: []string{"I " + getTime() + fmt.Sprintf(format, v...)}}) } func AddGroupTasksLog(format string, v ...any) { - go LogManagerRequestClient(fiber.MethodPost, "http://localhost:50110/v1/log", LogManagerRequestBody{ + go LogManagerRequestClient(fiber.MethodPost, config.Cfg.LogManagerServerUrl+"/v1/log", LogManagerRequestBody{ Type: "grouptasks", Logs: []string{"I " + getTime() + fmt.Sprintf(format, v...)}}) } diff --git a/modules/requestclient/requestclient.go b/modules/requestclient/requestclient.go index 38b683f..d864495 100644 --- a/modules/requestclient/requestclient.go +++ b/modules/requestclient/requestclient.go @@ -9,9 +9,6 @@ import ( "github.com/rs/zerolog/log" ) -//const Base = "https://inv.ex.umbach.dev" -//const ApiBase = Base + "/api" - func InvexApiRequestClient(requestMethod string, url string) (statusCode int, body []byte, err error) { a := fiber.AcquireAgent()