diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 5fd667c2e0..640ef1acd5 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -251,7 +251,7 @@ if ($get_module_detail) {
foreach ($columns as $col => $attr) {
if ($attr[1] != "modules_format_data") {
- $data[] = date('d F Y - h:i:s A', $row['utimestamp']);
+ $data[] = date('d F Y h:i:s A', $row['utimestamp']);
}
elseif (($config['command_snapshot']) && (preg_match ("/[\n]+/i", $row[$attr[0]]))) {
@@ -294,7 +294,17 @@ if ($get_module_detail) {
$data[] = 'No data';
}
else {
+
+ if(is_snapshot_data($row[$attr[0]])){
$data[] = "![](".io_safe_input($row[$attr[0]]).")
";
+ }
+ else{
+ $data[] = $row[$attr[0]];
+ }
+
+
+
+
}
}
}
diff --git a/pandora_console/include/languages/es.mo b/pandora_console/include/languages/es.mo
index 8a6a476a3b..9195840d34 100644
Binary files a/pandora_console/include/languages/es.mo and b/pandora_console/include/languages/es.mo differ
diff --git a/pandora_console/include/languages/es.po b/pandora_console/include/languages/es.po
index ae4415856d..467c3be94e 100644
--- a/pandora_console/include/languages/es.po
+++ b/pandora_console/include/languages/es.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: pandora-fms\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2016-11-03 10:13+0100\n"
-"PO-Revision-Date: 2016-11-03 10:53+0000\n"
+"PO-Revision-Date: 2016-11-07 12:05+0000\n"
"Last-Translator: artu30 \n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-11-03 11:04+0000\n"
+"X-Launchpad-Export-Date: 2016-11-07 12:11+0000\n"
"X-Generator: Launchpad (build 18246)\n"
#: ../../general/links_menu.php:20 ../../godmode/menu.php:284
@@ -10976,7 +10976,7 @@ msgstr "Siguiente IP disponible"
#: ../../enterprise/extensions/csv_import_group.php:27
msgid "CSV import group"
-msgstr "Importar el grupo a CSV"
+msgstr "Importar grupos de CSV"
#: ../../enterprise/extensions/resource_exportation/functions.php:19
#: ../../extensions/resource_exportation.php:350
@@ -33565,47 +33565,3 @@ msgstr "Nodo principal"
#~ msgid "Agent max"
#~ msgstr "Máximo agente"
-
-#~ msgid "Show percentil 95º"
-#~ msgstr "Mostrar porcentaje 95º"
-
-#~ msgid "Combined%20Sample%20Graph"
-#~ msgstr "Gráfico de Muestra Combinado"
-
-#~ msgid "Update manager » Messages"
-#~ msgstr "Administrador de actualizaciones » Mensajes"
-
-#~ msgid "Update manager » Online"
-#~ msgstr "Administrador de actualizaciones » Conectado"
-
-#~ msgid "Update manager » Offline"
-#~ msgstr "Administrador de actualizaciones » Sin conexión"
-
-#~ msgid "Update manager » Setup"
-#~ msgstr "Administrador de actualizaciones » Configuración"
-
-#, php-format
-#~ msgid "Percentile %dº"
-#~ msgstr "Porcentaje %dº"
-
-#~ msgid ""
-#~ "This happen when you have just created a module and it's not executed at "
-#~ "first time. Usually in a few seconds should be initialized and you will be "
-#~ "able to see in main view. If you keep non-init modules for more than 24hr "
-#~ "(due a problem in it's execution or configuration) they will be "
-#~ "automatically deleted by the system. Non-init are not visible in the “main "
-#~ "view”, you can see/edit them in the module administration section, in the "
-#~ "agent administrator."
-#~ msgstr ""
-#~ "Esto pasa cuando se acaba de crear un método y no se ejecuta la primera vez. "
-#~ "Habitualmente en unos segundos debería estar iniciado para que lo pueda ver "
-#~ "en la vista principal. Si se mantiene en la lista de módulos no iniciados "
-#~ "más tiempo de 24hrs (debido a un problema en su ejecución o configuración) "
-#~ "serán borrados automáticamente por el sistema."
-
-#~ msgid "Create group if doesn’t exist in destination"
-#~ msgstr "Crear grupo si no existe en el destino"
-
-#, php-format
-#~ msgid "® Ártica soluciones Pandora FMS %s - Build %s"
-#~ msgstr "® Ártica soluciones Pandora FMS %s - Versión %s"
diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index eead79c04e..afd8afe70a 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -694,3 +694,11 @@ else {
win32_service_run();
}
+################################################################################
+# Kill any scripts started by the Pandora FMS Server that are still running.
+################################################################################
+END {{
+ local $SIG{HUP} = "IGNORE";
+ kill("HUP", -$$);
+}}
+
diff --git a/pandora_server/lib/PandoraFMS/ReconServer.pm b/pandora_server/lib/PandoraFMS/ReconServer.pm
index a2453a8dd1..a4e20dc083 100644
--- a/pandora_server/lib/PandoraFMS/ReconServer.pm
+++ b/pandora_server/lib/PandoraFMS/ReconServer.pm
@@ -70,6 +70,9 @@ sub new ($$$$$$) {
$Sem = Thread::Semaphore->new;
$TaskSem = Thread::Semaphore->new (0);
+ db_do ($dbh, 'UPDATE trecon_task SET utimestamp = 0 WHERE id_recon_server = ? AND status <> -1',
+ get_server_id ($dbh, $config->{'servername'}, RECONSERVER));
+
# Call the constructor of the parent class
my $self = $class->SUPER::new($config, RECONSERVER, \&PandoraFMS::ReconServer::data_producer, \&PandoraFMS::ReconServer::data_consumer, $dbh);
@@ -517,8 +520,8 @@ sub exec_recon_script ($$$) {
logger ($pa_config, "Cannot execute recon task command $command.");
}
- # Notify this recon task is ended
- update_recon_task ($dbh, $task->{'id_rt'}, -1);
+ # Only update the timestamp in case something went wrong. The script should set the status.
+ db_do ($dbh, 'UPDATE trecon_task SET utimestamp = ? WHERE id_rt = ?', time (), $task->{'id_rt'});
logger($pa_config, 'Done executing recon script ' . safe_output($script->{'name'}), 10);
return 0;