Allowed to bind for a particular address/hostname for sgauth.

[stg.git] / projects / stargazer / main.cpp

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 3a9877155f2f9f373b80451738395791888e2be4..cabd991be6361e3f08695173b9387f4d903acaaa 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -99,7 +99,11 @@ else
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

+#ifdef LINUX

 int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings)
 int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings)

+#else
+int StartScriptExecuter(char *, int msgKey, int * msgID, SETTINGS_IMPL * settings)
+#endif

 {
 STG_LOGGER & WriteServLog = GetStgLogger();
 
 {
 STG_LOGGER & WriteServLog = GetStgLogger();
 


@@ -359,7 +363,8 @@ while (modIter != modules.end())
     {
     if (modIter->Load())
         {
     {
     if (modIter->Load())
         {

-        WriteServLog("Error: %s",
+        WriteServLog("Error loading module '%s': %s",
+                     modIter->GetPlugin()->GetVersion().c_str(),

                      modIter->GetStrError().c_str());
         goto exitLblNotStarted;
         }
                      modIter->GetStrError().c_str());
         goto exitLblNotStarted;
         }


@@ -386,7 +391,8 @@ while (modIter != modules.end())
     {
     if (modIter->Start())
         {
     {
     if (modIter->Start())
         {

-        WriteServLog("Error: %s",
+        WriteServLog("Error starting module '%s': %s",
+                     modIter->GetPlugin()->GetVersion().c_str(),

                      modIter->GetStrError().c_str());
         goto exitLbl;
         }
                      modIter->GetStrError().c_str());
         goto exitLbl;
         }


@@ -421,9 +427,9 @@ while (true)
                 {
                 if (modIter->Reload())
                     {
                 {
                 if (modIter->Reload())
                     {

-                    WriteServLog("Error reloading %s ('%s')", modIter->GetPlugin()->GetVersion().c_str(),
+                    WriteServLog("Error reloading module '%s': '%s'", modIter->GetPlugin()->GetVersion().c_str(),

                                                               modIter->GetStrError().c_str());
                                                               modIter->GetStrError().c_str());

-                    printfd(__FILE__, "Error reloading %s ('%s')\n", modIter->GetPlugin()->GetVersion().c_str(),
+                    printfd(__FILE__, "Error reloading module '%s': '%s'\n", modIter->GetPlugin()->GetVersion().c_str(),

                                                                      modIter->GetStrError().c_str());
                     }
                 }
                                                                      modIter->GetStrError().c_str());
                     }
                 }


@@ -469,12 +475,15 @@ while (modIter != modules.end())
     printfd(__FILE__, "Stopping module '%s'\n", name.c_str());
     if (modIter->Stop())
         {
     printfd(__FILE__, "Stopping module '%s'\n", name.c_str());
     if (modIter->Stop())
         {

-        WriteServLog("Module \'%s\': Error: %s",
+        WriteServLog("Error stopping module '%s': %s",

                      modIter->GetPlugin()->GetVersion().c_str(),
                      modIter->GetStrError().c_str());
                      modIter->GetPlugin()->GetVersion().c_str(),
                      modIter->GetStrError().c_str());

-        printfd(__FILE__, "Failed to stop module '%s'\n", name.c_str());
+        printfd(__FILE__, "Error stopping module '%s': '%s'\n", modIter->GetPlugin()->GetVersion().c_str(), modIter->GetStrError().c_str());
+        }
+    else
+        {
+        WriteServLog("Module: '%s'. Stop successfull.", modIter->GetPlugin()->GetVersion().c_str());

         }
         }

-    WriteServLog("Module: \'%s\'. Stop successfull.", modIter->GetPlugin()->GetVersion().c_str());

     ++modIter;
     }
 
     ++modIter;
     }
 


@@ -498,10 +507,10 @@ while (modIter != modules.end())
         printfd(__FILE__, "Unloading module '%s'\n", name.c_str());
         if (modIter->Unload())
             {
         printfd(__FILE__, "Unloading module '%s'\n", name.c_str());
         if (modIter->Unload())
             {

-            WriteServLog("Module \'%s\': Error: %s",
-                         name.c_str(),
+            WriteServLog("Error unloading module '%s': '%s'",
+                         modIter->GetPlugin()->GetVersion().c_str(),

                          modIter->GetStrError().c_str());
                          modIter->GetStrError().c_str());

-            printfd(__FILE__, "Failed to unload module '%s'\n", name.c_str());
+            printfd(__FILE__, "Error unloading module '%s': '%s'\n", modIter->GetPlugin()->GetVersion().c_str(), modIter->GetStrError().c_str());

             }
         }
     ++modIter;
             }
         }
     ++modIter;