0.3.0: clickable breadcrumb + tabs, images, templates (CRUD), create wizard
This commit is contained in:
1 parent
dea7668fd8
commit
3eb5e6d013
14 files changed
+729
-22
No files matched your search
+4
-2
@@ -59,7 +59,9 @@ $job['pid'] = getmypid();
|
||||
$job['started'] = time();
|
||||
vmm_job_write($job);
|
||||
|
||||
$argvVm = array_merge(VMM_ACTIONS[$verb]['argv'], [$name]);
|
||||
$argvVm = isset($job['argv']) && is_array($job['argv']) && $job['argv'] !== []
|
||||
? $job['argv']
|
||||
: array_merge(VMM_ACTIONS[$verb]['argv'], [$name]);
|
||||
joblog($log, 'start: vm ' . implode(' ', $argvVm));
|
||||
|
||||
$vm = vmm_resolve('vm');
|
||||
@@ -118,7 +120,7 @@ fclose($pipes[0]);
|
||||
stream_set_blocking($pipes[1], false);
|
||||
stream_set_blocking($pipes[2], false);
|
||||
|
||||
$timeout = (int)(VMM_ACTIONS[$verb]['timeout'] ?? 300);
|
||||
$timeout = (int)($job['timeout'] ?? (VMM_ACTIONS[$verb]['timeout'] ?? 300));
|
||||
$start = time();
|
||||
$timedOut = false;
|
||||
$cancelFile = VMM_JOBDIR . '/' . $id . '.cancel';
|
||||
|
||||
Reference in new issue
Block a user