From 9ff6af34d5f0aaa7c47d8763942f2a89678dc129 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Wed, 3 Sep 2014 19:30:38 -0700 Subject: [PATCH] Renamed image rebuild functions. --- meteor/client/lib/apps.js | 2 +- meteor/client/lib/docker.js | 2 +- meteor/client/lib/images.js | 8 ++++---- .../views/dashboard/images/dashboard-single-image.js | 2 +- .../views/dashboard/layouts/dashboard-images-layout.js | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meteor/client/lib/apps.js b/meteor/client/lib/apps.js index f8745c4306..9a9d606183 100644 --- a/meteor/client/lib/apps.js +++ b/meteor/client/lib/apps.js @@ -32,7 +32,7 @@ AppUtil.restartHelper = function (app) { docker: data }}); // Use dig to refresh the DNS - // exec('/usr/bin/dig dig ' + app.name + '.kite @172.17.42.1 ', function() {}); + exec('/usr/bin/dig dig ' + app.name + '.kite @172.17.42.1', function() {}); }); }); } diff --git a/meteor/client/lib/docker.js b/meteor/client/lib/docker.js index 02d55c6954..14622695a8 100644 --- a/meteor/client/lib/docker.js +++ b/meteor/client/lib/docker.js @@ -63,7 +63,7 @@ Docker.runContainer = function (app, image, callback) { if (err) { callback(err, null); return; } console.log('Started container: ' + container.id); // Use dig to refresh the DNS - exec('/usr/bin/dig dig ' + app.name + '.kite @172.17.42.1 ', function() {}); + exec('/usr/bin/dig dig ' + app.name + '.kite @172.17.42.1', function() {}); callback(null, container); }); }); diff --git a/meteor/client/lib/images.js b/meteor/client/lib/images.js index 4a7b6281fe..d82f613c37 100644 --- a/meteor/client/lib/images.js +++ b/meteor/client/lib/images.js @@ -56,7 +56,7 @@ ImageUtil.saveFolder = function (directory, imageId, callback) { } }; -ImageUtil.rebuild = function (image, callback) { +ImageUtil.rebuildHelper = function (image, callback) { Util.deleteFolder(image.path); var imageMetaData = ImageUtil.getMetaData(image.originPath); if (imageMetaData.logo) { @@ -91,7 +91,7 @@ ImageUtil.rebuild = function (image, callback) { }); }; -ImageUtil.rebuildImage = function (imageId) { +ImageUtil.rebuild = function (imageId) { var image = Images.findOne(imageId); if (!image) { throw new Meteor.Error(403, "No image found with this ID."); @@ -113,7 +113,7 @@ ImageUtil.rebuildImage = function (imageId) { } }); }); - ImageUtil.rebuild(image, function (err) { + ImageUtil.rebuildHelper(image, function (err) { if (err) { console.error(err); } }); _.each(apps, function (app) { @@ -123,7 +123,7 @@ ImageUtil.rebuildImage = function (imageId) { }); }); } else { - ImageUtil.rebuild(image, function (err) { + ImageUtil.rebuildHelper(image, function (err) { if (err) { console.error(err); } }); } diff --git a/meteor/client/views/dashboard/images/dashboard-single-image.js b/meteor/client/views/dashboard/images/dashboard-single-image.js index aa0723790e..4e21649bc2 100755 --- a/meteor/client/views/dashboard/images/dashboard-single-image.js +++ b/meteor/client/views/dashboard/images/dashboard-single-image.js @@ -18,7 +18,7 @@ Template.dashboard_single_image.events({ }, 'click .btn-rebuild': function () { $('.btn-icon').tooltip('hide'); - ImageUtil.rebuildImage(this._id, function (err) { + ImageUtil.rebuild(this._id, function (err) { if (err) { console.error(err); } }); } diff --git a/meteor/client/views/dashboard/layouts/dashboard-images-layout.js b/meteor/client/views/dashboard/layouts/dashboard-images-layout.js index f4051a5332..8018fff5a0 100755 --- a/meteor/client/views/dashboard/layouts/dashboard-images-layout.js +++ b/meteor/client/views/dashboard/layouts/dashboard-images-layout.js @@ -18,7 +18,7 @@ Template.dashboard_images_layout.events({ }, 'click .btn-rebuild': function () { $('.header .icons a').tooltip('hide'); - ImageUtil.rebuildImage(this._id, function (err) { + ImageUtil.rebuild(this._id, function (err) { if (err) { console.error(err); } }); }