Merge lp:~marcustomlinson/unity-scopes-api/debug_timeout_config_params into lp:unity-scopes-api/devel

[Marcus Tomlinson]

Hardcoded debug process and locate timeouts replaced with config parameters.

[Marcus Tomlinson (marcustomlinson)]

21 -- Process.Timeout

By the way, this Process.Timeout section of CONFIGFILES was incorrectly under Runtime.ini. So it was moved to its correct position under Registry.ini.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:612
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1476/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-amd64-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-i386-ci/17/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1476/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:614
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1478/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-i386-ci/19

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1478/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

62 + This parameter determines how the registry will wait for a scope

Should say "how long"?

review: Needs Information

[Marcus Tomlinson (marcustomlinson)]

> 62 + This parameter determines how the registry will wait for a scope
>
> Should say "how long"?

Yep, thats a mistake. Fixed.

[Paweł Stołowski (stolowski)]

335 + debug_process_timeout_ = get_optional_int(registry_config_group, debug_process_timeout_key, DFLT_DEBUG_PROCESS_TIMEOUT);
336 + if (process_timeout_ < 10 || process_timeout_ > 120000)

381 + debug_locate_timeout_ = get_optional_int(zmq_config_group, debug_locate_timeout_key, DFLT_ZMQ_DEBUG_LOCATE_TIMEOUT);
382 + if (locate_timeout_ < 10 || locate_timeout_ > 120000)
383 + {

Seems like the conditionals check wrong variables, i.e. not the ones read above? Or is it intended?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:615
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1479/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1479/rebuild

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

> 335 + debug_process_timeout_ = get_optional_int(registry_config_group,
> debug_process_timeout_key, DFLT_DEBUG_PROCESS_TIMEOUT);
> 336 + if (process_timeout_ < 10 || process_timeout_ > 120000)
>
>
> 381 + debug_locate_timeout_ = get_optional_int(zmq_config_group,
> debug_locate_timeout_key, DFLT_ZMQ_DEBUG_LOCATE_TIMEOUT);
> 382 + if (locate_timeout_ < 10 || locate_timeout_ > 120000)
> 383 + {
>
> Seems like the conditionals check wrong variables, i.e. not the ones read
> above? Or is it intended?

OOPS! Totally not intended! Good catch! Fixed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:617
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1480/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1480/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Yeah, looks good now, thanks! Would be great to have tests for this config aspect, but since this area is lacking tests completely at the moment and this would require quite some work, let's address it separately.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:619
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1481/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1481/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-autolanding/682/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-amd64-autolanding/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-autolanding/10
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-autolanding/10/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-i386-autolanding/10/console

review: Needs Fixing (continuous-integration)

[Paweł Stołowski (stolowski)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-06-16 13:55:23 +0000
+++ CMakeLists.txt	2015-06-29 15:09:40 +0000
@@ -218,7 +218,7 @@
 # API version
 set(UNITY_SCOPES_MAJOR 0)
 set(UNITY_SCOPES_MINOR 6)
-set(UNITY_SCOPES_MICRO 19)
+set(UNITY_SCOPES_MICRO 20)
 set(UNITY_SCOPES_SOVERSION 3)
 
 # Version for testing, with all symbols visible
 
=== modified file 'CONFIGFILES'
--- CONFIGFILES	2015-06-11 11:11:42 +0000
+++ CONFIGFILES	2015-06-29 15:09:40 +0000
@@ -76,22 +76,6 @@
 
   The default value is 10 seconds.
 
-- Process.Timeout
-
-  This parameter determines how the registry will wait for a scope
-  to start and stop. The registry waits for at most Process.Timeout
-  milliseconds before it concludes that a scope failed to initialize
-  or terminate correctly. If a scope does not respond
-  within the allotted time, it is killed with SIGKILL.
-
-  Only values in the range 10 to 15000 milliseconds are accepted.
-
-  The default value is 4000 milliseconds.
-
-  Note that this value must be less than Locate.Timeout in the [<Middleware>]
-  config group, otherwise the middleware can prematurely conclude that
-  a locate() request failed to start a scope.
-
 - CacheDir
 
   The parent directory under which a scope can write scope-specific data files
@@ -242,6 +226,15 @@
 
   The default value is 5000 milliseconds.
 
+- Debug.Locate.Timeout
+
+  This parameter overrides the value of Locate.Timeout above when DebugMode is enabled on
+  a target scope. (See DebugMode in <scope_id>.ini for more details)
+
+  Only values in the range 10 to 120000 milliseconds are accepted.
+
+  The default value is 30000 milliseconds.
+
 - Registry.Timeout
 
   The timeout to be used when invoking a twoway operation on the registry other
@@ -306,6 +299,31 @@
 
   The default value is "$HOME/.local/share/unity-scopes".
 
+- Process.Timeout
+
+  This parameter determines how long the registry will wait for a scope
+  to start and stop. The registry waits for at most Process.Timeout
+  milliseconds before it concludes that a scope failed to initialize
+  or terminate correctly. If a scope does not respond
+  within the allotted time, it is killed with SIGKILL.
+
+  Only values in the range 10 to 15000 milliseconds are accepted.
+
+  The default value is 4000 milliseconds.
+
+  Note that this value must be less than Locate.Timeout in the [<Middleware>]
+  config group, otherwise the middleware can prematurely conclude that
+  a locate() request failed to start a scope.
+
+- Debug.Process.Timeout
+
+  This parameter overrides the value of Process.Timeout above when DebugMode is enabled on
+  a target scope. (See DebugMode in <scope_id>.ini for more details)
+
+  Only values in the range 10 to 120000 milliseconds are accepted.
+
+  The default value is 30000 milliseconds.
+
 
 Smartscopes.ini
 --------------
 
=== modified file 'RELEASE_NOTES.md'
--- RELEASE_NOTES.md	2015-06-01 10:15:48 +0000
+++ RELEASE_NOTES.md	2015-06-29 15:09:40 +0000
@@ -1,6 +1,15 @@
 Release notes
 =============
 
+Changes in version 0.6.20
+=========================
+  - Added Debug.Process.Timeout configuration parameter to Registry.ini
+  - Added Debug.Locate.Timeout configuration parameter to Zmq.ini
+
+Changes in version 0.6.19
+=========================
+  - Support UNITY_SCOPES_CONFIG_DIR environment variable.
+
 Changes in version 0.6.18
 =========================
   - Allow child_scopes() and set_child_scopes() methods more time to
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-06-17 16:30:27 +0000
+++ debian/changelog	2015-06-29 15:09:40 +0000
@@ -1,3 +1,10 @@
+unity-scopes-api (0.6.20-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Added Debug.Process.Timeout configuration parameter to Registry.ini
+  * Added Debug.Locate.Timeout configuration parameter to Zmq.ini
+
+ -- Marcus Tomlinson <[e-mail]>  Mon, 29 Jun 2015 07:56:37 +0200
+
 unity-scopes-api (0.6.19+15.10.20150617.2-0ubuntu1) wily; urgency=medium
 
   [ Pawel Stolowski ]
 
=== modified file 'debian/libunity-scopes3.symbols'
--- debian/libunity-scopes3.symbols	2015-06-09 12:21:21 +0000
+++ debian/libunity-scopes3.symbols	2015-06-29 15:09:40 +0000
@@ -395,6 +395,7 @@
  (c++)"unity::scopes::internal::MiddlewareFactory::MiddlewareFactory(unity::scopes::internal::RuntimeImpl*)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::MiddlewareFactory::to_kind(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryConfig::click_installdir() const@Base" 0.4.3+14.10.20140428
+ (c++)"unity::scopes::internal::RegistryConfig::debug_process_timeout() const@Base" 0replaceme
  (c++)"unity::scopes::internal::RegistryConfig::identity() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryConfig::mw_configfile() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryConfig::mw_kind() const@Base" 0.4.0+14.04.20140312.1
 
=== modified file 'include/unity/scopes/internal/DfltConfig.h.in'
--- include/unity/scopes/internal/DfltConfig.h.in	2015-05-06 05:45:30 +0000
+++ include/unity/scopes/internal/DfltConfig.h.in	2015-06-29 15:09:40 +0000
@@ -46,13 +46,15 @@
 
 static constexpr char const* DFLT_SS_SCOPE_IDENTITY = "SmartScope";
 
-static constexpr int DFLT_REAP_EXPIRY = 45;                // seconds
-static constexpr int DFLT_REAP_INTERVAL = 10;              // seconds
-static constexpr int DFLT_PROCESS_TIMEOUT = 4000;          // milliseconds
-static constexpr int DFLT_ZMQ_TWOWAY_TIMEOUT = 500;        // milliseconds
-static constexpr int DFLT_ZMQ_LOCATE_TIMEOUT = 5000;       // milliseconds
-static constexpr int DFLT_ZMQ_REGISTRY_TIMEOUT = 5000;     // milliseconds
-static constexpr int DFLT_ZMQ_CHILDSCOPES_TIMEOUT = 2000;  // milliseconds
+static constexpr int DFLT_REAP_EXPIRY = 45;                  // seconds
+static constexpr int DFLT_REAP_INTERVAL = 10;                // seconds
+static constexpr int DFLT_PROCESS_TIMEOUT = 4000;            // milliseconds
+static constexpr int DFLT_DEBUG_PROCESS_TIMEOUT = 30000;     // milliseconds
+static constexpr int DFLT_ZMQ_TWOWAY_TIMEOUT = 500;          // milliseconds
+static constexpr int DFLT_ZMQ_LOCATE_TIMEOUT = 5000;         // milliseconds
+static constexpr int DFLT_ZMQ_DEBUG_LOCATE_TIMEOUT = 30000;  // milliseconds
+static constexpr int DFLT_ZMQ_REGISTRY_TIMEOUT = 5000;       // milliseconds
+static constexpr int DFLT_ZMQ_CHILDSCOPES_TIMEOUT = 2000;    // milliseconds
 
 static constexpr char const* DFLT_HOME_CACHE_SUBDIR = ".local/share/unity-scopes";
 static constexpr char const* DFLT_HOME_APP_SUBDIR = ".local/share";
 
=== modified file 'include/unity/scopes/internal/RegistryConfig.h'
--- include/unity/scopes/internal/RegistryConfig.h	2014-11-03 05:31:30 +0000
+++ include/unity/scopes/internal/RegistryConfig.h	2015-06-29 15:09:40 +0000
@@ -43,6 +43,7 @@
     std::string click_installdir() const;       // Directory for Click scope config files
     std::string scoperunner_path() const;       // Path to scoperunner binary
     int process_timeout() const;                // Milliseconds to wait before scope is considereed non-responsive.
+    int debug_process_timeout() const;          // Milliseconds to wait before scope is considereed non-responsive in debug mode.
 
 private:
     std::string identity_;
@@ -53,6 +54,7 @@
     std::string click_installdir_;
     std::string scoperunner_path_;
     int process_timeout_;                       // Milliseconds
+    int debug_process_timeout_;                 // Milliseconds
 };
 
 } // namespace internal
 
=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqConfig.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqConfig.h	2015-05-06 05:45:30 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqConfig.h	2015-06-29 15:09:40 +0000
@@ -38,6 +38,7 @@
     std::string endpoint_dir() const;
     int twoway_timeout() const;
     int locate_timeout() const;
+    int debug_locate_timeout() const;
     int registry_timeout() const;
     int child_scopes_timeout() const;
     std::string registry_endpoint_dir() const;
@@ -47,6 +48,7 @@
     std::string endpoint_dir_;
     int twoway_timeout_;
     int locate_timeout_;
+    int debug_locate_timeout_;
     int registry_timeout_;
     int child_scopes_timeout_;
     std::string registry_endpoint_dir_;
 
=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h	2015-05-06 05:45:30 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h	2015-06-29 15:09:40 +0000
@@ -93,6 +93,7 @@
     ThreadPool* oneway_pool();
     ThreadPool* twoway_pool();
     int64_t locate_timeout() const noexcept;
+    int64_t debug_locate_timeout() const noexcept;
     int64_t registry_timeout() const noexcept;
     int64_t child_scopes_timeout() const noexcept;
 
@@ -138,6 +139,7 @@
 
     int64_t twoway_timeout_;                    // Default timeout for twoway invocations
     int64_t locate_timeout_;                    // Timeout for registry locate()
+    int64_t debug_locate_timeout_;              // Timeout for registry locate() in debug mode
     int64_t registry_timeout_;                  // Timeout for registry operations other than locate()
     int64_t child_scopes_timeout_;              // Timeout for child_scopes() and set_child_scopes() methods
 
 
=== modified file 'scoperegistry/scoperegistry.cpp'
--- scoperegistry/scoperegistry.cpp	2015-06-26 09:00:04 +0000
+++ scoperegistry/scoperegistry.cpp	2015-06-29 15:09:40 +0000
@@ -293,7 +293,8 @@
                      string const& scoperunner_path,
                      string const& config_file,
                      bool click,
-                     int timeout_ms)
+                     int timeout_ms,
+                     int debug_timeout_ms)
 {
     unique_ptr<ScopeMetadataImpl> mi(new ScopeMetadataImpl(mw.get()));
     string scope_config(scope.second);
@@ -423,10 +424,10 @@
                 scope_dir.filename().native();
     }
 
-    // Check if this scope has requested debug mode, if so, set the process timeout to 30s
+    // Check if this scope has requested debug mode, if so, set the process timeout to debug_process_timeout
     if (sc.debug_mode())
     {
-        exec_data.timeout_ms = 30000;
+        exec_data.timeout_ms = debug_timeout_ms;
     }
     else
     {
@@ -479,13 +480,14 @@
                       string const& scoperunner_path,
                       string const& config_file,
                       bool click,
-                      int timeout_ms)
+                      int timeout_ms,
+                      int debug_timeout_ms)
 {
     for (auto&& pair : all_scopes)
     {
         try
         {
-            add_local_scope(registry, pair, mw, scoperunner_path, config_file, click, timeout_ms);
+            add_local_scope(registry, pair, mw, scoperunner_path, config_file, click, timeout_ms, debug_timeout_ms);
         }
         catch (unity::Exception const& e)
         {
@@ -555,6 +557,7 @@
         string click_installdir;
         string scoperunner_path;
         int process_timeout;
+        int debug_process_timeout;
         {
             RegistryConfig c(identity, runtime->registry_configfile());
             mw_kind = c.mw_kind();
@@ -563,6 +566,7 @@
             click_installdir = c.click_installdir();
             scoperunner_path = c.scoperunner_path();
             process_timeout = c.process_timeout();
+            debug_process_timeout = c.debug_process_timeout();
         } // Release memory for config parser
 
         // Inform the signal thread that it should shutdown the runtime
@@ -603,8 +607,8 @@
             local_scopes[scope_id] = argv[i];                   // operator[] overwrites pre-existing entries
         }
 
-        add_local_scopes(registry, local_scopes, middleware, scoperunner_path, config_file, false, process_timeout);
-        add_local_scopes(registry, click_scopes, middleware, scoperunner_path, config_file, true, process_timeout);
+        add_local_scopes(registry, local_scopes, middleware, scoperunner_path, config_file, false, process_timeout, debug_process_timeout);
+        add_local_scopes(registry, click_scopes, middleware, scoperunner_path, config_file, true, process_timeout, debug_process_timeout);
         if (ss_reg_id.empty())
         {
             error("no remote registry configured, only local scopes will be available");
@@ -615,12 +619,12 @@
         }
 
         // Configure watches for scope install directories
-        auto local_watch_lambda = [registry, &middleware, &scoperunner_path, &config_file, process_timeout]
+        auto local_watch_lambda = [registry, &middleware, &scoperunner_path, &config_file, process_timeout, debug_process_timeout]
                                   (pair<string, string> const& scope)
         {
             try
             {
-                add_local_scope(registry, scope, middleware, scoperunner_path, config_file, false, process_timeout);
+                add_local_scope(registry, scope, middleware, scoperunner_path, config_file, false, process_timeout, debug_process_timeout);
             }
             catch (unity::Exception const& e)
             {
@@ -631,12 +635,12 @@
         local_scopes_watcher.add_install_dir(scope_installdir);
         local_scopes_watcher.add_install_dir(oem_installdir);
 
-        auto click_watch_lambda = [registry, &middleware, &scoperunner_path, &config_file, process_timeout]
+        auto click_watch_lambda = [registry, &middleware, &scoperunner_path, &config_file, process_timeout, debug_process_timeout]
                                   (pair<string, string> const& scope)
         {
             try
             {
-                add_local_scope(registry, scope, middleware, scoperunner_path, config_file, true, process_timeout);
+                add_local_scope(registry, scope, middleware, scoperunner_path, config_file, true, process_timeout, debug_process_timeout);
             }
             catch (unity::Exception const& e)
             {
 
=== modified file 'src/scopes/internal/RegistryConfig.cpp'
--- src/scopes/internal/RegistryConfig.cpp	2014-08-08 12:21:47 +0000
+++ src/scopes/internal/RegistryConfig.cpp	2015-06-29 15:09:40 +0000
@@ -45,6 +45,7 @@
     const string click_installdir_key = "Click.InstallDir";
     const string scoperunner_path_key = "Scoperunner.Path";
     const string process_timeout_key = "Process.Timeout";
+    const string debug_process_timeout_key = "Debug.Process.Timeout";
 }
 
 RegistryConfig::RegistryConfig(string const& identity, string const& configfile) :
@@ -79,6 +80,11 @@
     {
         throw_ex("Illegal value (" + to_string(process_timeout_) + ") for " + process_timeout_key + ": value must be 10-15000 ms");
     }
+    debug_process_timeout_ = get_optional_int(registry_config_group, debug_process_timeout_key, DFLT_DEBUG_PROCESS_TIMEOUT);
+    if (debug_process_timeout_ < 10 || debug_process_timeout_ > 120000)
+    {
+        throw_ex("Illegal value (" + to_string(debug_process_timeout_) + ") for " + debug_process_timeout_key + ": value must be 10-120000 ms");
+    }
 
     KnownEntries const known_entries = {
                                           {  registry_config_group,
@@ -89,7 +95,8 @@
                                                 oem_installdir_key,
                                                 click_installdir_key,
                                                 scoperunner_path_key,
-                                                process_timeout_key
+                                                process_timeout_key,
+                                                debug_process_timeout_key
                                              }
                                           }
                                        };
@@ -140,6 +147,11 @@
     return process_timeout_;
 }
 
+int RegistryConfig::debug_process_timeout() const
+{
+    return debug_process_timeout_;
+}
+
 } // namespace internal
 
 } // namespace scopes
 
=== modified file 'src/scopes/internal/zmq_middleware/ZmqConfig.cpp'
--- src/scopes/internal/zmq_middleware/ZmqConfig.cpp	2015-05-06 05:45:30 +0000
+++ src/scopes/internal/zmq_middleware/ZmqConfig.cpp	2015-06-29 15:09:40 +0000
@@ -41,6 +41,7 @@
     const string endpoint_dir_key = "EndpointDir";
     const string twoway_timeout_key = "Default.Twoway.Timeout";
     const string locate_timeout_key = "Locate.Timeout";
+    const string debug_locate_timeout_key = "Debug.Locate.Timeout";
     const string registry_timeout_key = "Registry.Timeout";
     const string child_scopes_timeout_key = "ChildScopes.Timeout";
     const string registry_endpoint_dir_key = "Registry.EndpointDir";
@@ -91,6 +92,12 @@
         throw_ex("Illegal value (" + to_string(locate_timeout_) + ") for " + locate_timeout_key + ": value must be 10-15000");
     }
 
+    debug_locate_timeout_ = get_optional_int(zmq_config_group, debug_locate_timeout_key, DFLT_ZMQ_DEBUG_LOCATE_TIMEOUT);
+    if (debug_locate_timeout_ < 10 || debug_locate_timeout_ > 120000)
+    {
+        throw_ex("Illegal value (" + to_string(debug_locate_timeout_) + ") for " + debug_locate_timeout_key + ": value must be 10-120000");
+    }
+
     child_scopes_timeout_ = get_optional_int(zmq_config_group, child_scopes_timeout_key, DFLT_ZMQ_CHILDSCOPES_TIMEOUT);
     if (child_scopes_timeout_ < 10 || child_scopes_timeout_ > 15000)
     {
@@ -106,6 +113,7 @@
                                                 endpoint_dir_key,
                                                 twoway_timeout_key,
                                                 locate_timeout_key,
+                                                debug_locate_timeout_key,
                                                 registry_timeout_key,
                                                 child_scopes_timeout_key,
                                                 registry_endpoint_dir_key,
@@ -135,6 +143,11 @@
     return locate_timeout_;
 }
 
+int ZmqConfig::debug_locate_timeout() const
+{
+    return debug_locate_timeout_;
+}
+
 int ZmqConfig::registry_timeout() const
 {
     return registry_timeout_;
 
=== modified file 'src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp'
--- src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp	2015-05-06 05:45:30 +0000
+++ src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp	2015-06-29 15:09:40 +0000
@@ -106,6 +106,7 @@
 
         twoway_timeout_ = config.twoway_timeout();
         locate_timeout_ = config.locate_timeout();
+        debug_locate_timeout_ = config.debug_locate_timeout();
         registry_timeout_ = config.registry_timeout();
         child_scopes_timeout_ = config.child_scopes_timeout();
         public_endpoint_dir_ = config.endpoint_dir();
@@ -810,6 +811,11 @@
     return locate_timeout_;
 }
 
+int64_t ZmqMiddleware::debug_locate_timeout() const noexcept
+{
+    return debug_locate_timeout_;
+}
+
 int64_t ZmqMiddleware::registry_timeout() const noexcept
 {
     return registry_timeout_;
 
=== modified file 'src/scopes/internal/zmq_middleware/ZmqScope.cpp'
--- src/scopes/internal/zmq_middleware/ZmqScope.cpp	2015-06-26 09:00:04 +0000
+++ src/scopes/internal/zmq_middleware/ZmqScope.cpp	2015-06-29 15:09:40 +0000
@@ -325,7 +325,8 @@
         capnp::MallocMessageBuilder request_builder;
         make_request_(request_builder, "debug_mode");
 
-        auto future = mw_base()->twoway_pool()->submit([&] { return this->invoke_twoway_(request_builder, -1, 30000); });
+        int64_t timeout = mw_base()->debug_locate_timeout();
+        auto future = mw_base()->twoway_pool()->submit([&] { return this->invoke_twoway_(request_builder, -1, timeout); });
         auto out_params = future.get();
         auto response = out_params.reader->getRoot<capnproto::Response>();
         throw_if_runtime_exception(response);
@@ -345,10 +346,11 @@
 ZmqObjectProxy::TwowayOutParams ZmqScope::invoke_scope_(capnp::MessageBuilder& in_params, int64_t timeout)
 {
     // Check if this scope has requested debug mode, if so, disable two-way timeout and set
-    // locate timeout to 30s.
+    // locate timeout to debug_locate_timeout.
     if (debug_mode())
     {
-        return this->invoke_twoway_(in_params, -1, 30000);
+        int64_t timeout = mw_base()->debug_locate_timeout();
+        return this->invoke_twoway_(in_params, -1, timeout);
     }
     return this->invoke_twoway_(in_params, timeout);
 }