You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/07/17 12:20:32 UTC
[1/2] incubator-ignite git commit: # ignite-1121 Refactoring.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1121 98e16251f -> 268921527
# ignite-1121 Refactoring.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bafdc2e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bafdc2e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bafdc2e5
Branch: refs/heads/ignite-1121
Commit: bafdc2e58a9032a22c9bc099a5acb37d912e07ef
Parents: 147301d
Author: Andrey <an...@gridgain.com>
Authored: Fri Jul 17 17:21:03 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jul 17 17:21:03 2015 +0700
----------------------------------------------------------------------
modules/web-control-center/nodejs/app.js | 5 ++---
modules/web-control-center/nodejs/bin/www | 11 +++++++++--
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bafdc2e5/modules/web-control-center/nodejs/app.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/app.js b/modules/web-control-center/nodejs/app.js
index cdbf7ea..8cd8494 100644
--- a/modules/web-control-center/nodejs/app.js
+++ b/modules/web-control-center/nodejs/app.js
@@ -33,7 +33,7 @@ var summary = require('./routes/summary');
var adminRouter = require('./routes/admin');
var profileRouter = require('./routes/profile');
var sqlRouter = require('./routes/sql');
-var agentManager = require('./agents/agent-manager');
+var agentRouter = require('./routes/agent');
var passport = require('passport');
@@ -122,6 +122,7 @@ app.use('/configuration/caches', cachesRouter);
app.use('/configuration/metadata', metadataRouter);
app.use('/configuration/summary', summary);
app.use('/sql', sqlRouter);
+app.use('/agent', agentRouter);
// Catch 404 and forward to error handler.
app.use(function (req, res, next) {
@@ -152,6 +153,4 @@ app.use(function (err, req, res) {
});
});
-agentManager.getOrCreate();
-
module.exports = app;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bafdc2e5/modules/web-control-center/nodejs/bin/www
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/bin/www b/modules/web-control-center/nodejs/bin/www
index 4cf0583..8ace728 100644
--- a/modules/web-control-center/nodejs/bin/www
+++ b/modules/web-control-center/nodejs/bin/www
@@ -3,10 +3,12 @@
/**
* Module dependencies.
*/
-var app = require('../app');
+var http = require('http');
var config = require('../helpers/configuration-loader.js');
+var app = require('../app');
+var agentServer = require('./agents/agent-manager');
+
var debug = require('debug')('ignite-web-control-center:server');
-var http = require('http');
/**
* Get port from environment and store in Express.
@@ -27,6 +29,11 @@ server.on('error', onError);
server.on('listening', onListening);
/**
+ * Start agent server.
+ */
+agentServer.getOrCreate();
+
+/**
* Normalize a port into a number, string, or false.
*/
function normalizePort(val) {
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-1121' into ignite-1121
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-1121' into ignite-1121
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/26892152
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/26892152
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/26892152
Branch: refs/heads/ignite-1121
Commit: 2689215277fa98de8e2a9178be25c73cc376ea41
Parents: bafdc2e 98e1625
Author: Andrey <an...@gridgain.com>
Authored: Fri Jul 17 17:21:18 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jul 17 17:21:18 2015 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/agent/AgentLauncher.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------