summaryrefslogtreecommitdiffstats
path: root/inc
diff options
context:
space:
mode:
authorSimon Rettberg2018-05-07 17:34:35 +0200
committerSimon Rettberg2018-05-07 17:34:35 +0200
commit9b24161637553f3889d9a81344e6eec59dc6aa00 (patch)
tree55a6734634ba8ffc83b244b1d495bb89836dc00a /inc
parenttaskmanager.js: Support setting min height of log <pre> (diff)
downloadslx-admin-9b24161637553f3889d9a81344e6eec59dc6aa00.tar.gz
slx-admin-9b24161637553f3889d9a81344e6eec59dc6aa00.tar.xz
slx-admin-9b24161637553f3889d9a81344e6eec59dc6aa00.zip
[serversetup-bwlp] Add log output to ipxe building task
Diffstat (limited to 'inc')
-rw-r--r--inc/event.inc.php3
-rw-r--r--inc/trigger.inc.php1
2 files changed, 2 insertions, 2 deletions
diff --git a/inc/event.inc.php b/inc/event.inc.php
index fe59b2b9..b1ee3663 100644
--- a/inc/event.inc.php
+++ b/inc/event.inc.php
@@ -98,8 +98,7 @@ class Event
public static function serverIpChanged()
{
error_log('Server ip changed');
- global $tidIpxe;
- $tidIpxe = Trigger::ipxe();
+ Trigger::ipxe();
if (Module::isAvailable('sysconfig')) { // TODO: Modularize events
ConfigModule::serverIpChanged();
}
diff --git a/inc/trigger.inc.php b/inc/trigger.inc.php
index b49cafb0..93f57236 100644
--- a/inc/trigger.inc.php
+++ b/inc/trigger.inc.php
@@ -25,6 +25,7 @@ class Trigger
$task = Taskmanager::submit('CompileIPxe', $data);
if (!isset($task['id']))
return false;
+ Property::set('ipxe-task-id', $task['id'], 15);
return $task['id'];
}