add launch arguments to console output

This commit is contained in:
Stephen Birarda 2015-12-22 14:47:26 -07:00
parent 050ccba968
commit 1229ed9a7f
5 changed files with 26 additions and 23 deletions

View file

@ -16,11 +16,11 @@ html {
body {
height: 100%;
overflow: auto;
font-family: 'Raleway', sans-serif;
font-family: 'Raleway';
background-image: url('../images/background.jpg');
margin: 0;
font-size: 11px;
letter-spacing: 1px;
letter-spacing: 0.075rem;
}
input, textarea, select, a {
@ -48,6 +48,11 @@ header {
margin: 0px 75px;
color: white;
a {
color: white;
text-decoration: none;
}
p {
text-align: center;
}

View file

@ -28,10 +28,12 @@
<p>Search</p>
</div>
<div id="nav-last-visited" class="nav-item">
<div class="tray-square nav-square">
<img src="images/last-visited.svg" />
</div>
<p>Last visited</p>
<a href="#" id="last-visited-link">
<div class="tray-square nav-square">
<img src="images/last-visited.svg" />
</div>
<p>Last visited</p>
</a>
</div>
</div>
<div class="tray-line"></div>

View file

@ -71,11 +71,8 @@ $(function() {
}
}
$('#process-interface .power-on').click(function() {
ipcRenderer.send('start-process', { name: 'interface' });
});
$('#process-interface .power-off').click(function() {
ipcRenderer.send('stop-process', { name: 'interface' });
$('#last-visited-link').click(function() {
ipcRenderer.send('start-interface');
});
$('#manage-server #restart').click(function() {
ipcRenderer.send('restart-server', { name: 'home' });

View file

@ -120,8 +120,6 @@ app.on('ready', function() {
var logPath = path.join(app.getAppPath(), 'logs');
if (interfacePath && dsPath && acPath) {
var pInterface = new Process('interface', interfacePath);
var homeServer = new ProcessGroup('home', [
new Process('domain-server', dsPath),
new Process('ac-monitor', acPath, ['-n6', '--log-directory', logPath])
@ -129,12 +127,10 @@ app.on('ready', function() {
// make sure we stop child processes on app quit
app.on('quit', function(){
pInterface.stop();
homeServer.stop();
});
var processes = {
interface: pInterface,
home: homeServer
};
@ -152,19 +148,22 @@ app.on('ready', function() {
}
// handle process updates
// pInterface.on('state-update', sendProcessUpdate);
homeServer.on('process-update', sendProcessUpdate);
homeServer.on('state-update', sendProcessGroupUpdate);
// start the home server
homeServer.start();
// ipcMain.on('start-process', function(event, arg) {
// pInterface.start();
// });
// ipcMain.on('stop-process', function(event, arg) {
// pInterface.stop();
// });
ipcMain.on('start-interface', function(event, arg) {
// create a new Interface instance - Interface makes sure only one is running at a time
var args = [];
if (args.url) {
args << "--url" << args.url
}
var pInterface = new Process('interface', interfacePath);
pInterface.start();
});
ipcMain.on('restart-server', function(event, arg) {
homeServer.restart();

View file

@ -117,7 +117,7 @@ Process.prototype = extend(Process.prototype, {
console.warn("Can't start process that is not stopped.");
return;
}
console.log("Starting " + this.command);
console.log("Starting " + this.command + " " + this.commandArgs.join(' '));
var logStdout = 'ignore',
logStderr = 'ignore';