[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/nepomuk/server
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2008-04-06 10:52:21
Message-ID: 1207479141.114846.21448.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 794047 by trueg:

Somewhat finer grained process control

 M  +3 -2      processcontrol.cpp  
 M  +2 -0      servicecontroller.cpp  


--- trunk/KDE/kdebase/runtime/nepomuk/server/processcontrol.cpp #794046:794047
@@ -61,8 +61,9 @@
 void ProcessControl::stop()
 {
     if ( mProcess.state() != QProcess::NotRunning ) {
-        mProcess.waitForFinished( 30000 );
-        mProcess.terminate();
+        if ( !mProcess.waitForFinished( 30000 ) ) {
+            mProcess.terminate();
+        }
     }
 }
 
--- trunk/KDE/kdebase/runtime/nepomuk/server/servicecontroller.cpp #794046:794047
@@ -165,8 +165,10 @@
 {
     if( isRunning() ) {
         kDebug(300002) << "Stopping" << name();
+        d->processControl->setCrashPolicy( ProcessControl::StopOnCrash );
         d->serviceControlInterface->shutdown();
         d->processControl->stop();
+        d->processControl->setCrashPolicy( ProcessControl::RestartOnCrash );
     }
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]