Restarting node on deploy.

ansible/deploy_node.yml

@@ -18,14 +18,14 @@
       command: "docker kill --signal=HUP {{ item.container_name }}"
       when: item.target_host in inventory_hostname
       with_items:
-        - container_name: node_socket
-          target_host: 'node-socket'
-        - container_name: 'original_pages'
-          target_host: 'node-page'
-        - container_name: 'original_text'
-          target_host: 'node-text'
-        - container_name: 'favicons'
-          target_host: 'node-favicons'
-        - container_name: 'imageproxy'
-          target_host: 'node-images'
+        - container_name: node
+          target_host: node-socket
+        - container_name: node
+          target_host: node-page
+        - container_name: node
+          target_host: node-text
+        - container_name: node
+          target_host: node-favicons
+        - container_name: imageproxy
+          target_host: node-images
 

ansible/roles/node/handlers/main.yml

@@ -7,3 +7,8 @@
     name: consul
     state: reloaded
   listen: reload consul
+
+- name: restart node
+  become: yes
+  command: docker restart node
+  listen: restart node

ansible/roles/node/tasks/main.yml

@@ -4,6 +4,14 @@
     src: /srv/secrets-newsblur/settings/dotenv.env
     dest: /srv/newsblur/node/.env
   register: app_changed
+  notify: restart node
+  with_items:
+    - node-socket
+    - node-page
+    - node-text
+    - node-favicons
+    - staging
+  when: item in inventory_hostname
 
 - name: Add SERVER_NAME to app secrets
   lineinfile:

node/newsblur.coffee

@@ -1,9 +1,11 @@
+Sentry = require "@sentry/node"
+Tracing = require "@sentry/tracing"
 app = require('express')()
 server = require('http').createServer(app)
 log    = require './log.js'
-Sentry = require "@sentry/node"
-Tracing = require "@sentry/tracing"
-require('dotenv').config()
+envresult = require('dotenv').config()
+if envresult.error
+  throw envresult.error
 
 original_page = require('./original_page.js').original_page
 original_text = require('./original_text.js').original_text

node/newsblur.js

@@ -1,6 +1,10 @@
 // Generated by CoffeeScript 2.5.1
 (function() {
-  var Sentry, Tracing, app, favicons, log, original_page, original_text, server, unread_counts;
+  var Sentry, Tracing, app, envresult, favicons, log, original_page, original_text, server, unread_counts;
+
+  Sentry = require("@sentry/node");
+
+  Tracing = require("@sentry/tracing");
 
   app = require('express')();
 
@@ -8,11 +12,11 @@
 
   log = require('./log.js');
 
-  Sentry = require("@sentry/node");
+  envresult = require('dotenv').config();
 
-  Tracing = require("@sentry/tracing");
-
-  require('dotenv').config();
+  if (envresult.error) {
+    throw envresult.error;
+  }
 
   original_page = require('./original_page.js').original_page;