[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:       2010-04-13 16:42:19
Message-ID: 20100413164219.264A9AC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1114463 by trueg:

Include the service name in the debug messages

 M  +11 -6     processcontrol.cpp  
 M  +2 -0      processcontrol.h  


--- trunk/KDE/kdebase/runtime/nepomuk/server/processcontrol.cpp #1114462:1114463
@@ -90,27 +90,27 @@
         if ( mPolicy == RestartOnCrash ) {
              // don't try to start an unstartable application
             if ( !mFailedToStart && --mCrashCount >= 0 ) {
-                qDebug( "Application '%s' crashed! %d restarts left.", qPrintable( \
mApplication ), mCrashCount ); +                qDebug( "Application '%s' crashed! %d \
restarts left.", qPrintable( commandLine() ), mCrashCount );  start();
             } else {
                 if ( mFailedToStart ) {
-                    qDebug( "Application '%s' failed to start!", qPrintable( \
mApplication ) ); +                    qDebug( "Application '%s' failed to start!", \
qPrintable( commandLine() ) );  } else {
-                    qDebug( "Application '%s' crashed to often. Giving up!", \
qPrintable( mApplication ) ); +                    qDebug( "Application '%s' crashed \
to often. Giving up!", qPrintable( commandLine() ) );  }
                 emit finished(false);
             }
         } else {
-            qDebug( "Application '%s' crashed. No restart!", qPrintable( \
mApplication ) ); +            qDebug( "Application '%s' crashed. No restart!", \
qPrintable( commandLine() ) );  }
     } else {
         if ( exitCode != 0 ) {
             qDebug( "ProcessControl: Application '%s' returned with exit code %d \
                (%s)",
-                    qPrintable( mApplication ), exitCode, qPrintable( \
mProcess.errorString() ) ); +                    qPrintable( commandLine() ), \
exitCode, qPrintable( mProcess.errorString() ) );  mFailedToStart = true;
             emit finished(false);
         } else {
-            qDebug( "Application '%s' exited normally...", qPrintable( mApplication \
) ); +            qDebug( "Application '%s' exited normally...", qPrintable( \
commandLine() ) );  emit finished(true);
         }
     }
@@ -145,4 +145,9 @@
     return mProcess.state() == QProcess::Running;
 }
 
+QString ProcessControl::commandLine() const
+{
+    return mApplication + QLatin1String(" ") + mArguments.join(QLatin1String(" "));
+}
+
 #include "processcontrol.moc"
--- trunk/KDE/kdebase/runtime/nepomuk/server/processcontrol.h #1114462:1114463
@@ -97,6 +97,8 @@
 private:
     bool start();
 
+    QString commandLine() const;
+
     QProcess mProcess;
     QString mApplication;
     QStringList mArguments;


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