diff --git a/.gitignore b/.gitignore index 8e5b7f0d..81ec4a1b 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ package-lock\.json checkSinfoOut\.txt \.#userNameUpdate\.sh + +\.#package\.json diff --git a/Driver.py b/Driver.py index 0d768b83..233e287a 100755 --- a/Driver.py +++ b/Driver.py @@ -123,12 +123,13 @@ def isSlurmOn(): squeueStatus = os.popen("squeue").read(); if "squeue: error:" in str(squeueStatus): - logTest("SLURM is not on, please re-run"); + logTest("SLURM is not running on the background, please run \'sudo bash runSlurm.sh\'. \n"); logTest(squeueStatus); sys.exit(); logTest("Current Slurm Running jobs status: \n" + squeueStatus); - logTest("Waiting new job to come since block number: " + blockReadFrom + " ... | Current Time: " + time.ctime() + '| ClusterGainedAmount: ' + clusterGainedAmount); + logTest("Current Time: " + time.ctime() + '| ClusterGainedAmount: ' + clusterGainedAmount); + logTest("Waiting new job to come since block number: " + blockReadFrom); printFlag=0; currentBlockNumber = contractCall('echo "$header; console.log( \'\' + mylib.blockNumber )"'); diff --git a/initialize.sh b/initialize.sh index 2d778247..3f04bd68 100644 --- a/initialize.sh +++ b/initialize.sh @@ -54,4 +54,5 @@ sed -i.bak 's/'$lineOld'/'$lineNew'/' $currentDir/eBlocHeader.js && rm $currentD sed -i.bak 's/'$lineOld'/'$lineNew'/' $currentDir/main.js && rm $currentDir/main.js.bak #----------------------------------------------------- +cd $currentDir/ npm install --save diff --git a/package.json b/package.json index ec57d97b..c8a1cebe 100644 --- a/package.json +++ b/package.json @@ -1,27 +1,27 @@ { - "name": "eblocbrokergit", - "version": "1.0.0", - "description": "## eBlocBroker is a blockchain based autonomous computational resource broker", - "main": "main.js", - "directories": { - "doc": "docs" - }, - "dependencies": { - "binstring": "*", - "bs58": "*", - "web3": "*", - "web3_ipc": "*", - "minilock-cli": "*" - }, - "devDependencies": {}, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/ebloc/eBlocBroker.git" - }, - "author": "", - "license": "ISC", - "homepage": "http://ebloc.cmpe.boun.edu.tr:3003" + "name": "eBlocBroker", + "version": "1.0.0", + "description": "## eBlocBroker is a blockchain based autonomous computational resource broker", + "main": "main.js", + "directories": { + "doc": "docs" + }, + "dependencies": { + "binstring": "*", + "bs58": "*", + "web3": "*", + "web3_ipc": "*", + "minilock-cli": "*" + }, + "devDependencies": {}, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/ebloc/eBlocBroker.git" + }, + "author": "", + "license": "ISC", + "homepage": "http://ebloc.cmpe.boun.edu.tr:3003" }