[X2Go-Commits] [x2goclient] 04/04: onmainwindow.cpp: wait 3 seconds before checking sshd startup state to allow it to come up.

git-admin at x2go.org git-admin at x2go.org
Fri Mar 13 01:08:41 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit ef033df55e18545e72fe17e27b62ed9f97cdb8c7
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Mar 13 01:08:27 2015 +0100

    onmainwindow.cpp: wait 3 seconds before checking sshd startup state to allow it to come up.
---
 debian/changelog     |    2 ++
 src/onmainwindow.cpp |    6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 12490a6..7d34be6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -233,6 +233,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
       running.
     - onmainwindow.cpp: on OS X, specify sshd's PID file location in its
       server config.
+    - onmainwindow.cpp: wait 3 seconds before checking sshd startup state to
+      allow it to come up.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 19 Feb 2015 13:25:28 +0100
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 7fc8480..d1f3076 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10023,6 +10023,12 @@ bool ONMainWindow::startSshd()
     sshd->start (binary, arguments);
 #endif // defined (Q_OS_WIN)
 
+    // Allow sshd a grace time of 3 seconds to come up.
+    QTime sleepTime = QTime::currentTime ().addSecs (3);
+    while (QTime::currentTime () < sleepTime) {
+        QCoreApplication::processEvents (QEventLoop::AllEvents, 100);
+    }
+
     if (!isServerRunning (clientSshPort.toInt ())) {
         printSshDError_startupFailure ();
         x2goDebug << "Failed to start usermode sshd.";

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list