You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ne...@apache.org on 2017/04/20 14:37:25 UTC
[1/3] incubator-trafficcontrol git commit: hooks up db dump
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 8eda1c7f5 -> 583223fa6
hooks up db dump
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/1f7fdfdd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/1f7fdfdd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/1f7fdfdd
Branch: refs/heads/master
Commit: 1f7fdfdd5591eed44bd7465f5431914c00422e26
Parents: 5401660
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Thu Apr 20 08:24:36 2017 -0600
Committer: David Neuman <da...@gmail.com>
Committed: Thu Apr 20 08:37:06 2017 -0600
----------------------------------------------------------------------
.../ui/app/src/common/api/TrafficOpsService.js | 5 +++
.../common/modules/header/HeaderController.js | 8 ++---
.../src/common/modules/header/header.tpl.html | 2 +-
traffic_ops/experimental/ui/server.js | 33 ++++++++++++++++++++
4 files changed, 43 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1f7fdfdd/traffic_ops/experimental/ui/app/src/common/api/TrafficOpsService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/TrafficOpsService.js b/traffic_ops/experimental/ui/app/src/common/api/TrafficOpsService.js
index 6c6ff82..9b121e4 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/TrafficOpsService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/TrafficOpsService.js
@@ -34,6 +34,11 @@ var TrafficOpsService = function($http, $q) {
return deferred.promise;
};
+ this.dumpDB = function() {
+ // todo: need to fix this so it is not hard-coded
+ window.location = 'http://localhost:3000/api/1.2/dbdump';
+ };
+
};
TrafficOpsService.$inject = ['$http', '$q'];
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1f7fdfdd/traffic_ops/experimental/ui/app/src/common/modules/header/HeaderController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/header/HeaderController.js b/traffic_ops/experimental/ui/app/src/common/modules/header/HeaderController.js
index 90f9b51..31cd123 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/header/HeaderController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/header/HeaderController.js
@@ -17,7 +17,7 @@
* under the License.
*/
-var HeaderController = function($rootScope, $scope, $log, $state, $anchorScroll, $interval, locationUtils, authService, changeLogService, userModel) {
+var HeaderController = function($rootScope, $scope, $log, $state, $anchorScroll, $interval, locationUtils, authService, changeLogService, trafficOpsService, userModel) {
$scope.isCollapsed = true;
@@ -52,8 +52,8 @@ var HeaderController = function($rootScope, $scope, $log, $state, $anchorScroll,
authService.logout();
};
- $scope.downloadDB = function() {
- alert('not hooked up yet: downloadDB');
+ $scope.dumpDB = function() {
+ trafficOpsService.dumpDB();
};
$scope.navigateToPath = locationUtils.navigateToPath;
@@ -136,5 +136,5 @@ var HeaderController = function($rootScope, $scope, $log, $state, $anchorScroll,
init();
};
-HeaderController.$inject = ['$rootScope', '$scope', '$log', '$state', '$anchorScroll', '$interval', 'locationUtils', 'authService', 'changeLogService', 'userModel'];
+HeaderController.$inject = ['$rootScope', '$scope', '$log', '$state', '$anchorScroll', '$interval', 'locationUtils', 'authService', 'changeLogService', 'trafficOpsService', 'userModel'];
module.exports = HeaderController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1f7fdfdd/traffic_ops/experimental/ui/app/src/common/modules/header/header.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/header/header.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/header/header.tpl.html
index ece21a7..c9e9bf3 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/header/header.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/header/header.tpl.html
@@ -64,7 +64,7 @@ under the License.
</li>
<li>
<div class="btn-group" title="Download DB">
- <button type="button" class="btn btn-link" ng-click="downloadDB()"><i class="fa fa-download"></i></button>
+ <button type="button" class="btn btn-link" ng-click="dumpDB()"><i class="fa fa-download"></i></button>
</div>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1f7fdfdd/traffic_ops/experimental/ui/server.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/server.js b/traffic_ops/experimental/ui/server.js
index 15c7b1b..2960039 100644
--- a/traffic_ops/experimental/ui/server.js
+++ b/traffic_ops/experimental/ui/server.js
@@ -80,6 +80,39 @@ if (app.get('env') === 'dev') {
app.set('env', 'production');
}
+// special handling required for dbdump. haven't got this to work yet
+// app.get('/dbdump', function (req, res) {
+// var port = (useSSL) ? config.sslPort : config.port,
+// options = {
+// method: 'GET',
+// host: 'localhost',
+// port: port,
+// path: '/api/1.2/dbdump',
+// headers: {
+// cookie: req.headers['cookie']
+// }
+// };
+//
+// var request = http.request(options, function(response) {
+// var data = [];
+// console.log(response.statusCode);
+// response.on('data', function(chunk) {
+// data.push(chunk);
+// });
+// response.on('end', function() {
+// data = Buffer.concat(data);
+// res.writeHead(200, {
+// 'Content-Type': 'application/download',
+// 'Content-Disposition': 'attachment; filename=foo.dump.gz',
+// 'Content-Length': data.length
+// });
+// res.end(data);
+// });
+// });
+//
+// request.end();
+// });
+
// Enable reverse proxy support in Express. This causes the
// the "X-Forwarded-Proto" header field to be trusted so its
// value can be used to determine the protocol. See
[3/3] incubator-trafficcontrol git commit: This closes #492
Posted by ne...@apache.org.
This closes #492
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/583223fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/583223fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/583223fa
Branch: refs/heads/master
Commit: 583223fa67f04a2bc4d081d1cfddabfd71360e26
Parents: 1f7fdfd
Author: David Neuman <da...@gmail.com>
Authored: Thu Apr 20 08:37:18 2017 -0600
Committer: David Neuman <da...@gmail.com>
Committed: Thu Apr 20 08:37:18 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] incubator-trafficcontrol git commit: hide loading bar when
newlogcount is called
Posted by ne...@apache.org.
hide loading bar when newlogcount is called
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/54016605
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/54016605
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/54016605
Branch: refs/heads/master
Commit: 540166051548779dbc48b5820e41435856b92609
Parents: 8eda1c7
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Wed Apr 19 20:34:37 2017 -0600
Committer: David Neuman <da...@gmail.com>
Committed: Thu Apr 20 08:37:06 2017 -0600
----------------------------------------------------------------------
traffic_ops/experimental/ui/app/src/common/api/ChangeLogService.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/54016605/traffic_ops/experimental/ui/app/src/common/api/ChangeLogService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/ChangeLogService.js b/traffic_ops/experimental/ui/app/src/common/api/ChangeLogService.js
index 6d62e24..133438e 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/ChangeLogService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/ChangeLogService.js
@@ -20,7 +20,7 @@
var ChangeLogService = function(Restangular, $rootScope, httpService, ENV) {
this.getNewLogCount = function() {
- return httpService.get(ENV.api['root'] + 'logs/newcount');
+ return httpService.get(ENV.api['root'] + 'logs/newcount', { ignoreLoadingBar: true });
};
this.getChangeLogs = function(queryParams) {