Repository: incubator-ignite Updated Branches: refs/heads/ignite-1121 5ae69f29f -> ab14ce173
# IGNITE-1121 Move agent server port to configuration. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ab14ce17 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ab14ce17 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ab14ce17 Branch: refs/heads/ignite-1121 Commit: ab14ce173bce17b9612605fd1eba35f97f1d390e Parents: 5ae69f2 Author: sevdokimov <[email protected]> Authored: Tue Jul 14 13:53:48 2015 +0300 Committer: sevdokimov <[email protected]> Committed: Tue Jul 14 13:53:48 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/agent/AgentLauncher.java | 2 +- modules/web-control-center/nodejs/bridge/bridge.js | 5 ++++- modules/web-control-center/nodejs/config/default.json | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab14ce17/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java index 70a6ba9d..50e91d4 100644 --- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java +++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java @@ -77,7 +77,7 @@ public class AgentLauncher { String uri = cmd.getOptionValue('u'); if (uri == null) - cfg.setUri("ws://localhost:8088"); + cfg.setUri("ws://localhost:3001"); else cfg.setUri(uri); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab14ce17/modules/web-control-center/nodejs/bridge/bridge.js ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/bridge/bridge.js b/modules/web-control-center/nodejs/bridge/bridge.js index 74c6ae5..99faff1 100644 --- a/modules/web-control-center/nodejs/bridge/bridge.js +++ b/modules/web-control-center/nodejs/bridge/bridge.js @@ -17,6 +17,8 @@ var WebSocketServer = require('ws').Server; +var config = require('../helpers/configuration-loader.js'); + var http = require('http'); var db = require('../db'); @@ -83,7 +85,8 @@ function Client(ws) { function Server() { var server = http.createServer(); - server.listen(8088); + + server.listen(config.get('monitor:agentsServerPort')); var wss = new WebSocketServer({ server: server }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab14ce17/modules/web-control-center/nodejs/config/default.json ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/config/default.json b/modules/web-control-center/nodejs/config/default.json index 72dbd4e..acdd6eb 100644 --- a/modules/web-control-center/nodejs/config/default.json +++ b/modules/web-control-center/nodejs/config/default.json @@ -4,5 +4,8 @@ }, "mongoDB": { "url": "mongodb://localhost/web-control-center" + }, + "monitor": { + "agentsServerPort": 3001 } } \ No newline at end of file
