From 92e2879211c20025c136038aa3df38ff45313bed Mon Sep 17 00:00:00 2001 From: cubedro Date: Tue, 3 Mar 2015 19:52:13 +0200 Subject: [PATCH] fixed version for go impl --- lib/node.js | 10 ++++++++- processes-go.json | 37 +++++++++++++++++++++++++++++++ processes.json | 55 ++++++++++++++++++++++++----------------------- 3 files changed, 74 insertions(+), 28 deletions(-) create mode 100644 processes-go.json diff --git a/lib/node.js b/lib/node.js index 92791b2..98a0ecd 100644 --- a/lib/node.js +++ b/lib/node.js @@ -21,7 +21,15 @@ var INSTANCE_NAME, if(process.env.NODE_ENV === 'production') { INSTANCE_NAME = shelljs.exec('ec2metadata --instance-id', {silent: true}).output; - ETH_VERSION = shelljs.exec('eth -V', {silent: true}).output; + + if(ETH_IMPLEMENTATION === 'Go') + { + ETH_VERSION = shelljs.exec('ethereum -version', {silent: true}).output; + } + else + { + ETH_VERSION = shelljs.exec('eth -V', {silent: true}).output; + } } var socket = new Socket(process.env.WS_SERVER || 'ws://localhost:3000'); diff --git a/processes-go.json b/processes-go.json new file mode 100644 index 0000000..c4f7019 --- /dev/null +++ b/processes-go.json @@ -0,0 +1,37 @@ +[ + { + "name" : "eth", + "cwd" : "/home/ubuntu/bin/www/", + "script" : "bin/eth.sh", + "log_file" : "/home/ubuntu/logs/eth-log.log", + "out_file" : "/home/ubuntu/logs/eth-out.log", + "error_file" : "/home/ubuntu/logs/eth-err.log", + "merge_logs" : true, + "watch" : false, + "cron_restart" : "0 0 * * *", + "exec_interpreter" : "bash", + "exec_mode" : "fork_mode" + }, + { + "name" : "node-app", + "cwd" : "/home/ubuntu/bin/www/", + "script" : "app.js", + "log_file" : "/home/ubuntu/logs/node-app-log.log", + "out_file" : "/home/ubuntu/logs/node-app-out.log", + "error_file" : "/home/ubuntu/logs/node-app-err.log", + "merge_logs" : true, + "watch" : false, + "cron_restart" : "0 0 * * *", + "exec_interpreter" : "node", + "exec_mode" : "fork_mode", + "env": + { + "NODE_ENV" : "production", + "RPC_HOST" : "localhost", + "RPC_PORT" : "8080", + "ETH_IMPLEMENTATION" : "Go", + "WS_SERVER" : "wss://eth-netstats.herokuapp.com", + "WS_SECRET" : "eth-net-stats-has-a-secret", + } + } +] \ No newline at end of file diff --git a/processes.json b/processes.json index 6f71108..a8f5900 100644 --- a/processes.json +++ b/processes.json @@ -1,36 +1,37 @@ [ { - "name" : "eth", - "cwd" : "/home/ubuntu/bin/www/", - "script" : "bin/eth.sh", - "log_file" : "/home/ubuntu/logs/eth-log.log", - "out_file" : "/home/ubuntu/logs/eth-out.log", - "error_file" : "/home/ubuntu/logs/eth-err.log", - "merge_logs" : true, - "watch" : false, - "cron_restart" : "0 0 * * *", - "exec_interpreter" : "bash", - "exec_mode" : "fork_mode" + "name" : "eth", + "cwd" : "/home/ubuntu/bin/www/", + "script" : "bin/eth.sh", + "log_file" : "/home/ubuntu/logs/eth-log.log", + "out_file" : "/home/ubuntu/logs/eth-out.log", + "error_file" : "/home/ubuntu/logs/eth-err.log", + "merge_logs" : true, + "watch" : false, + "cron_restart" : "0 0 * * *", + "exec_interpreter" : "bash", + "exec_mode" : "fork_mode" }, { - "name" : "node-app", - "cwd" : "/home/ubuntu/bin/www/", - "script" : "app.js", - "log_file" : "/home/ubuntu/logs/node-app-log.log", - "out_file" : "/home/ubuntu/logs/node-app-out.log", - "error_file" : "/home/ubuntu/logs/node-app-err.log", - "merge_logs" : true, - "watch" : false, - "cron_restart" : "0 0 * * *", - "exec_interpreter" : "node", - "exec_mode" : "fork_mode", + "name" : "node-app", + "cwd" : "/home/ubuntu/bin/www/", + "script" : "app.js", + "log_file" : "/home/ubuntu/logs/node-app-log.log", + "out_file" : "/home/ubuntu/logs/node-app-out.log", + "error_file" : "/home/ubuntu/logs/node-app-err.log", + "merge_logs" : true, + "watch" : false, + "cron_restart" : "0 0 * * *", + "exec_interpreter" : "node", + "exec_mode" : "fork_mode", "env": { - "NODE_ENV" : "production", - "RPC_HOST" : "localhost", - "RPC_PORT" : "8080", - "WS_SERVER" : "wss://eth-netstats.herokuapp.com", - "WS_SECRET" : "eth-net-stats-has-a-secret", + "NODE_ENV" : "production", + "RPC_HOST" : "localhost", + "RPC_PORT" : "8080", + "ETH_IMPLEMENTATION" : "Cpp", + "WS_SERVER" : "wss://eth-netstats.herokuapp.com", + "WS_SECRET" : "eth-net-stats-has-a-secret", } } ] \ No newline at end of file