Skip to content
This repository was archived by the owner on May 22, 2018. It is now read-only.

Commit 760943f

Browse files
corsproxy shepherd API update & OS X Installer download files fix update
1 parent ce3c163 commit 760943f

2 files changed

Lines changed: 32 additions & 2 deletions

File tree

assets/BitRock Installer Files/IgaunaApp-OSX.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@
5656
<showMessageOnError>0</showMessageOnError>
5757
</createDirectory>
5858
<showProgressDialog>
59-
<title>Downloading files</title>
59+
<abortOnError>0</abortOnError>
60+
<explanation>Zcash Params file: sprout-proving.key</explanation>
61+
<progressText>Zcash Params file: sprout-proving.key</progressText>
62+
<showMessageOnError>0</showMessageOnError>
63+
<title>Downloading Zcash Params file</title>
6064
<actionList>
6165
<httpGet>
6266
<abortOnError>0</abortOnError>
@@ -75,7 +79,10 @@
7579
</ruleList>
7680
</showProgressDialog>
7781
<showProgressDialog>
78-
<title>Downloading files</title>
82+
<abortOnError>0</abortOnError>
83+
<explanation>Zcash Params file: sprout-verifying.key</explanation>
84+
<progressText>Zcash Params file: sprout-verifying.key</progressText>
85+
<title>Downloading Zcash Params files</title>
7986
<actionList>
8087
<httpGet>
8188
<abortOnError>0</abortOnError>

routes/shepherd.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ var shepherd = express.Router();
2121
// IGUANA FILES AND CONFIG SETTINGS
2222

2323
var iguanaConfsDirSrc = path.join(__dirname, '../assets/deps/confs');
24+
var CorsProxyBin = path.join(__dirname, '../node_modules/corsproxy/bin/corsproxy');
2425

2526
// SETTING OS DIR TO RUN IGUANA FROM
2627
// SETTING APP ICON FOR LINUX AND WINDOWS
@@ -187,6 +188,28 @@ function herder(flock, data) {
187188
});
188189
});
189190
}
191+
192+
if (flock === 'corsproxy') {
193+
console.log('corsproxy flock selected...');
194+
console.log('selected data: '+data);
195+
196+
pm2.connect(true,function(err) { //start up pm2 god
197+
if (err) {
198+
console.error(err);
199+
process.exit(2);
200+
}
201+
202+
pm2.start({
203+
script: CorsProxyBin, // path to binary
204+
name: 'CORSPROXY', //REVS, USD, EUR etc.
205+
exec_mode : 'fork',
206+
cwd: iguanaDir,
207+
}, function(err, apps) {
208+
pm2.disconnect(); // Disconnect from PM2
209+
if (err) throw err
210+
});
211+
});
212+
}
190213
}
191214

192215

0 commit comments

Comments
 (0)