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

[Marcus Tomlinson]

Cleaned up idle_timeout_ initialisation after new config updates

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:328
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/491/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/43
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/43/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/43/console

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

review: Needs Fixing (continuous-integration)

[lp:~marcustomlinson/unity-scopes-api/post_config_stage2_fix]

329. By Marcus Tomlinson on 2014-05-09

Merged config-fixes-stage2

Unmerged revisions

=== modified file 'src/scopes/internal/ScopeConfig.cpp'
--- src/scopes/internal/ScopeConfig.cpp	2014-05-09 04:24:50 +0000
+++ src/scopes/internal/ScopeConfig.cpp	2014-05-09 06:58:05 +0000
@@ -124,16 +124,8 @@
     {
     }
 
-    ///! TODO: replace code below with commented-out line once config-fixes-stage2 lands
-    // idle_timeout_ = get_optional_int(scope_config_group, idle_timeout_key, DFLT_SCOPE_IDLE_TIMEOUT);
-    try
-    {
-        idle_timeout_ = parser()->get_int(scope_config_group, idle_timeout_key);
-    }
-    catch (unity::LogicException const&)
-    {
-        idle_timeout_ = DFLT_SCOPE_IDLE_TIMEOUT;
-    }
+    idle_timeout_ = get_optional_int(scope_config_group, idle_timeout_key, DFLT_SCOPE_IDLE_TIMEOUT);
+
     // Negative values and values greater than max int (once multiplied by 1000 (s to ms)) are illegal
     const int max_idle_timeout = std::numeric_limits<int>::max() / 1000;
     if (idle_timeout_ < 0 || idle_timeout_ > max_idle_timeout)