diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-17 00:23:33 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-17 00:23:33 +0000 |
| commit | 4663e92cf5c5fb8f07c4d414b3abae0a02eb467f (patch) | |
| tree | 140578142be9db668a7f033592158955b17cca62 | |
| parent | d75386c7f9a18276ef670fa96e099c3687c598f5 (diff) | |
| download | chromium_src-4663e92cf5c5fb8f07c4d414b3abae0a02eb467f.zip chromium_src-4663e92cf5c5fb8f07c4d414b3abae0a02eb467f.tar.gz chromium_src-4663e92cf5c5fb8f07c4d414b3abae0a02eb467f.tar.bz2 | |
Increase DaemonControllerLinux timeout for starting host service
BUG=274763
TEST=Tested by tweaking the script so it takes >5s to start the host.
R=jamiewalch@chromium.org
Review URL: https://codereview.chromium.org/22824019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218127 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | remoting/host/setup/daemon_controller_linux.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/remoting/host/setup/daemon_controller_linux.cc b/remoting/host/setup/daemon_controller_linux.cc index 1fb2598..e2d6566 100644 --- a/remoting/host/setup/daemon_controller_linux.cc +++ b/remoting/host/setup/daemon_controller_linux.cc @@ -36,8 +36,10 @@ namespace { const char kDaemonScript[] = "/opt/google/chrome-remote-desktop/chrome-remote-desktop"; -// Timeout for running daemon script. -const int64 kDaemonTimeoutMs = 5000; +// Timeout for running daemon script. The script itself sets a timeout when +// waiting for the host to come online, so the setting here should be at least +// as long. +const int64 kDaemonTimeoutMs = 60000; // Timeout for commands that require password prompt - 5 minutes. const int64 kSudoTimeoutSeconds = 5 * 60; |