diff --git a/lib/Alchemy/Phrasea/Controller/Admin/TaskManagerController.php b/lib/Alchemy/Phrasea/Controller/Admin/TaskManagerController.php index 164b481aec..0d262b8c94 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/TaskManagerController.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/TaskManagerController.php @@ -178,6 +178,7 @@ class TaskManagerController extends Controller public function getSchedulerLog(Request $request) { + file_put_contents("/tmp/phraseanet-log.txt", sprintf("%s (%d) %s\n", __FILE__, __LINE__, var_export(null, true)), FILE_APPEND); /** @var LogFileFactory $factory */ $factory = $this->app['task-manager.log-file.factory']; $logFile = $factory->forManager(); @@ -185,7 +186,7 @@ class TaskManagerController extends Controller $logFile->clear($request->query->get('version')); } - return $this->render('admin/task-manager/log.html.twig', [ + return $this->render('admin/task-manager/log_scheduler.html.twig', [ 'logfile' => $logFile, 'version' => $request->query->get('version'), 'logname' => 'Scheduler', @@ -202,7 +203,7 @@ class TaskManagerController extends Controller $logFile->clear($request->query->get('version')); } - return $this->render('admin/task-manager/log.html.twig', [ + return $this->render('admin/task-manager/log_task.html.twig', [ 'logfile' => $logFile, 'version' => $request->query->get('version'), 'logname' => sprintf('%s (task id %d)', $task->getName(), $task->getId()), diff --git a/lib/Alchemy/Phrasea/TaskManager/Log/TaskLogFile.php b/lib/Alchemy/Phrasea/TaskManager/Log/TaskLogFile.php index c85ef5d67f..da8f5d590f 100644 --- a/lib/Alchemy/Phrasea/TaskManager/Log/TaskLogFile.php +++ b/lib/Alchemy/Phrasea/TaskManager/Log/TaskLogFile.php @@ -47,6 +47,8 @@ class TaskLogFile extends AbstractLogFile implements LogFileInterface */ public function getPath($version) { + $path = sprintf('%s/task_%d%s.log', $this->root, $this->task->getId(), $version ? ('-'.$version) : ''); + file_put_contents("/tmp/phraseanet-log.txt", sprintf("%s (%d) %s\n", __FILE__, __LINE__, var_export($path, true)), FILE_APPEND); return sprintf('%s/task_%d%s.log', $this->root, $this->task->getId(), $version ? ('-'.$version) : ''); } } diff --git a/templates/web/admin/task-manager/log.html.twig b/templates/web/admin/task-manager/log_scheduler.html.twig similarity index 82% rename from templates/web/admin/task-manager/log.html.twig rename to templates/web/admin/task-manager/log_scheduler.html.twig index e7f748f5d9..fda8767441 100644 --- a/templates/web/admin/task-manager/log.html.twig +++ b/templates/web/admin/task-manager/log_scheduler.html.twig @@ -3,11 +3,7 @@

{{ logname }}

{% for v in logfile.getVersions() %} - {% if version != null and v == version %} - {{v}}] - {% else %} [{{v}}] - {% endif %}   {% endfor %} {% if version != null %} diff --git a/templates/web/admin/task-manager/log_task.html.twig b/templates/web/admin/task-manager/log_task.html.twig new file mode 100644 index 0000000000..c48ffefdf5 --- /dev/null +++ b/templates/web/admin/task-manager/log_task.html.twig @@ -0,0 +1,24 @@ + + + < {{ 'Return' | trans }} + +

+ {{ logfile.getTask().getName() }} (task id {{ logfile.getTask.getId() }}) + {% if version is not null %} + version {{ version ? version : "(now)" }} + {% endif %} +

+ +{% for v in logfile.getVersions() %} + {{ v ? v : "(now)" }} +   +{% endfor %} + +{% if version is not null %} +
+        {{ logfile.getContent(version) }}
+    
+ + {{ 'Clear' | trans }} + +{% endif %}