Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 02:03:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

add launch arguments to console output

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

9
console/src/css/style.less
View file

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

10
console/src/index.html
View file

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

7
console/src/index.js
View file

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

21
console/src/main.js
View file

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

2
console/src/modules/hf-process.js
View file

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