Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
avatar-lavventura committed Feb 23, 2018
1 parent 91ce3fc commit 1dc5470
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 27 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,5 @@ package-lock\.json
checkSinfoOut\.txt

\.#userNameUpdate\.sh

\.#package\.json
5 changes: 3 additions & 2 deletions Driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 )"');
Expand Down
1 change: 1 addition & 0 deletions initialize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
@@ -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"
}

0 comments on commit 1dc5470

Please sign in to comment.