From 5110f83fae3c8c922ee6387b603620a9baf6ef88 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Thu, 27 Jul 2017 10:46:29 +0200 Subject: [PATCH] fix(rest): fix an issue with rest factories using $http (#1077) --- app/rest/docker/containerLogs.js | 4 ++-- app/rest/docker/containerTop.js | 6 ++++-- app/rest/docker/serviceLogs.js | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/rest/docker/containerLogs.js b/app/rest/docker/containerLogs.js index c7798066f..6b77fabb9 100644 --- a/app/rest/docker/containerLogs.js +++ b/app/rest/docker/containerLogs.js @@ -5,7 +5,7 @@ angular.module('portainer.rest') get: function (id, params, callback) { $http({ method: 'GET', - url: API_ENDPOINT_ENDPOINTS + '/' + EndpointProvider.endpointID() + '/containers/' + id + '/logs', + url: API_ENDPOINT_ENDPOINTS + '/' + EndpointProvider.endpointID() + '/docker/containers/' + id + '/logs', params: { 'stdout': params.stdout || 0, 'stderr': params.stderr || 0, @@ -13,7 +13,7 @@ angular.module('portainer.rest') 'tail': params.tail || 'all' } }).success(callback).error(function (data, status, headers, config) { - console.log(error, data); + console.log(data); }); } }; diff --git a/app/rest/docker/containerTop.js b/app/rest/docker/containerTop.js index 5df3020fa..57e51d51c 100644 --- a/app/rest/docker/containerTop.js +++ b/app/rest/docker/containerTop.js @@ -5,11 +5,13 @@ angular.module('portainer.rest') get: function (id, params, callback, errorCallback) { $http({ method: 'GET', - url: API_ENDPOINT_ENDPOINTS + '/' + EndpointProvider.endpointID() + '/containers/' + id + '/top', + url: API_ENDPOINT_ENDPOINTS + '/' + EndpointProvider.endpointID() + '/docker/containers/' + id + '/top', params: { ps_args: params.ps_args } - }).success(callback); + }).success(callback).error(function (data, status, headers, config) { + console.log(data); + }); } }; }]); diff --git a/app/rest/docker/serviceLogs.js b/app/rest/docker/serviceLogs.js index cefb57c6e..87e03e6b9 100644 --- a/app/rest/docker/serviceLogs.js +++ b/app/rest/docker/serviceLogs.js @@ -5,7 +5,7 @@ angular.module('portainer.rest') get: function (id, params, callback) { $http({ method: 'GET', - url: API_ENDPOINT_ENDPOINTS + '/' + EndpointProvider.endpointID() + '/services/' + id + '/logs', + url: API_ENDPOINT_ENDPOINTS + '/' + EndpointProvider.endpointID() + '/docker/services/' + id + '/logs', params: { 'stdout': params.stdout || 0, 'stderr': params.stderr || 0, @@ -13,7 +13,7 @@ angular.module('portainer.rest') 'tail': params.tail || 'all' } }).success(callback).error(function (data, status, headers, config) { - console.log(error, data); + console.log(data); }); } };