diff --git a/fabfile.py b/fabfile.py index f814d4293..30aeaf33d 100644 --- a/fabfile.py +++ b/fabfile.py @@ -1459,7 +1459,9 @@ def kill(): else: run('./utils/kill_gunicorn.sh') +@parallel def deploy_node(): + pull() with virtualenv(): run('sudo supervisorctl restart node_unread') run('sudo supervisorctl restart node_unread_ssl') diff --git a/node/favicons.coffee b/node/favicons.coffee index bb090c970..1b789ef13 100644 --- a/node/favicons.coffee +++ b/node/favicons.coffee @@ -21,7 +21,7 @@ else url = "mongodb://#{MONGODB_SERVER}:#{MONGODB_PORT}/newsblur?replicaSet=nbset&readPreference=secondaryPreferred" mongo.MongoClient.connect url, (err, db) => - console.log " ---> Connected to #{db.serverConfig?.s.host}:#{db.serverConfig?.s.port} / #{err}" + console.log " ---> Connected to #{db?.serverConfig.s.host}:#{db?.serverConfig.s.port} / #{err}" @collection = db.collection "feed_icons" app.get /\/rss_feeds\/icon\/(\d+)\/?/, (req, res) => diff --git a/node/favicons.js b/node/favicons.js index b03cd8a98..415624513 100644 --- a/node/favicons.js +++ b/node/favicons.js @@ -33,8 +33,7 @@ mongo.MongoClient.connect(url, (function(_this) { return function(err, db) { - var _ref, _ref1; - console.log(" ---> Connected to " + ((_ref = db.serverConfig) != null ? _ref.s.host : void 0) + ":" + ((_ref1 = db.serverConfig) != null ? _ref1.s.port : void 0) + " / " + err); + console.log(" ---> Connected to " + (db != null ? db.serverConfig.s.host : void 0) + ":" + (db != null ? db.serverConfig.s.port : void 0) + " / " + err); return _this.collection = db.collection("feed_icons"); }; })(this));