Merge lp:~marcustomlinson/unity-js-scopes/lp-1527622 into lp:unity-js-scopes

[Marcus Tomlinson]

Stop the scopes runtime and exit gracefully upon SIGTERM

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:121
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/65
        deb: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/65/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/64

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-js-scopes-ci/64/rebuild

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

LGTM

review: Approve

[Marcus Tomlinson (marcustomlinson)]

> LGTM

Thanks for the review. Top approving.

=== modified file 'src/bindings/CMakeLists.txt'
--- src/bindings/CMakeLists.txt	2015-11-13 08:28:39 +0000
+++ src/bindings/CMakeLists.txt	2015-12-18 14:28:56 +0000
@@ -24,6 +24,7 @@
     ./src/*.h
     ./src/*.cc
     ./lib/*.js
+    ./*.js
     )
 
 add_definitions(
 
=== modified file 'src/bindings/index.js'
--- src/bindings/index.js	2015-10-28 18:46:50 +0000
+++ src/bindings/index.js	2015-12-18 14:28:56 +0000
@@ -224,3 +224,7 @@
             return self;
         },
     });
+
+process.on('SIGTERM', function() {
+  self._scope_binding.stop();
+});
 
=== modified file 'src/bindings/src/addon.cc'
--- src/bindings/src/addon.cc	2015-12-09 07:22:06 +0000
+++ src/bindings/src/addon.cc	2015-12-18 14:28:56 +0000
@@ -119,7 +119,8 @@
     js_scope
       .add_method("scope_base", &JavascriptScopeRuntime::scope_base)
       .add_method("scope_config", &JavascriptScopeRuntime::scope_config)
-      .add_method("run", &JavascriptScopeRuntime::run);
+      .add_method("run", &JavascriptScopeRuntime::run)
+      .add_method("stop", &JavascriptScopeRuntime::stop);
 
     v8cpp::Class<ScopeBase> scope_base(isolate);
     scope_base
 
=== modified file 'src/bindings/src/scope.cc'
--- src/bindings/src/scope.cc	2015-08-25 09:40:42 +0000
+++ src/bindings/src/scope.cc	2015-12-18 14:28:56 +0000
@@ -99,6 +99,11 @@
   }, nullptr);
 }
 
+void JavascriptScopeRuntime::stop()
+{
+  runtime_->destroy();
+}
+
 std::string JavascriptScopeRuntime::scope_config() const {
   return scope_config_;
 }
 
=== modified file 'src/bindings/src/scope.h'
--- src/bindings/src/scope.h	2015-08-25 09:40:42 +0000
+++ src/bindings/src/scope.h	2015-12-18 14:28:56 +0000
@@ -38,6 +38,7 @@
 
   ScopeBase* scope_base();
   void run(const std::string& scope_config);
+  void stop();
   std::string scope_config() const;
 
  private: