Fixed parameters style in sgconv.conf.

[stg.git] / projects / stargazer / plugins / other / ping / ping.cpp

diff --git a/projects/stargazer/plugins/other/ping/ping.cpp b/projects/stargazer/plugins/other/ping/ping.cpp
index f4755c230491f73cbec8e7f8c63e22b4ea9bc45f..7f47b7cf8464906ee754cc9c3977ca054ca100a8 100644 (file)
--- a/projects/stargazer/plugins/other/ping/ping.cpp
+++ b/projects/stargazer/plugins/other/ping/ping.cpp
@@ -74,7 +74,8 @@ PING::PING()
       ChgCurrIPNotifierList(),
       ChgIPNotifierList(),
       onAddUserNotifier(*this),
       ChgCurrIPNotifierList(),
       ChgIPNotifierList(),
       onAddUserNotifier(*this),

-      onDelUserNotifier(*this)
+      onDelUserNotifier(*this),
+      logger(GetPluginLogger(GetStgLogger(), "ping"))

 {
 pthread_mutex_init(&mutex, NULL);
 }
 {
 pthread_mutex_init(&mutex, NULL);
 }


@@ -107,6 +108,7 @@ pinger.Start();
 if (pthread_create(&thread, NULL, Run, this))
     {
     errorStr = "Cannot start thread.";
 if (pthread_create(&thread, NULL, Run, this))
     {
     errorStr = "Cannot start thread.";

+    logger("Cannot create thread.");

     printfd(__FILE__, "Cannot start thread\n");
     return -1;
     }
     printfd(__FILE__, "Cannot start thread\n");
     return -1;
     }


@@ -133,19 +135,6 @@ for (int i = 0; i < 25; i++)
     nanosleep(&ts, NULL);
     }
 
     nanosleep(&ts, NULL);
     }
 

-//after 5 seconds waiting thread still running. now kill it
-if (isRunning)
-    {
-    printfd(__FILE__, "kill PING thread.\n");
-    if (pthread_kill(thread, SIGINT))
-        {
-        errorStr = "Cannot kill PING thread.";
-        printfd(__FILE__, "Cannot kill PING thread.\n");
-        return -1;
-        }
-    printfd(__FILE__, "PING killed\n");
-    }
-

 users->DelNotifierUserAdd(&onAddUserNotifier);
 users->DelNotifierUserDel(&onDelUserNotifier);
 
 users->DelNotifierUserAdd(&onAddUserNotifier);
 users->DelNotifierUserDel(&onDelUserNotifier);
 


@@ -157,6 +146,9 @@ while (users_iter != usersList.end())
     ++users_iter;
     }
 
     ++users_iter;
     }
 

+if (isRunning)
+    return -1;
+

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------