X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/597f6f31e3801612273886481381df509d8bcd12..19684ed5aca4366468f3d9cac0848edd46a1d1cf:/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp index 3cd6b901..e3199047 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp @@ -61,7 +61,8 @@ STG_CONFIG::STG_CONFIG() thread(), nonstop(false), isRunning(false), - config(), + logger(GetPluginLogger(GetStgLogger(), "conf_sg")), + config(logger), users(NULL), admins(NULL), tariffs(NULL), @@ -103,6 +104,7 @@ if (pthread_create(&thread, NULL, Run, this)) { errorStr = "Cannot create thread."; printfd(__FILE__, "Cannot create thread\n"); + logger("Cannot create thread."); return -1; } errorStr = ""; @@ -127,18 +129,8 @@ for (i = 0; i < 25; i++) nanosleep(&ts, NULL); } -//after 5 seconds waiting thread still running. now killing it if (isRunning) - { - //TODO pthread_cancel() - if (pthread_kill(thread, SIGINT)) - { - errorStr = "Cannot kill thread."; - printfd(__FILE__, "Cannot kill thread\n"); - return -1; - } - printfd(__FILE__, "STG_CONFIG killed\n"); - } + return -1; return 0; }