diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog index 25a5ccc289..d16868d571 100644 --- a/pandora_agents/win32/ChangeLog +++ b/pandora_agents/win32/ChangeLog @@ -1,3 +1,12 @@ +2007-08-16 Esteban Sanchez + + * pandora_windows_service.cc: Do not check debug flag if copying was + not successful. + + * bin/README: Updated options. + + * bin/PandoraAgent.exe: Updated to last commit. + 2007-08-07 Esteban Sanchez * pandora.cc: Updated agent version. diff --git a/pandora_agents/win32/bin/PandoraAgent.exe b/pandora_agents/win32/bin/PandoraAgent.exe index ab4872db21..697533d518 100755 Binary files a/pandora_agents/win32/bin/PandoraAgent.exe and b/pandora_agents/win32/bin/PandoraAgent.exe differ diff --git a/pandora_agents/win32/bin/README b/pandora_agents/win32/bin/README index 891ed7d2a5..893222fa1b 100644 --- a/pandora_agents/win32/bin/README +++ b/pandora_agents/win32/bin/README @@ -17,6 +17,11 @@ server_ip - Hostname or Pandora Server IP where the gathered data will be sent. server_path - Path where the server will store the data sent by agent. Usually is "/opt/pandora/data_in". +transfer_mode - Transfer method from agent to server. Could be "ssh" or "ftp". + +ftp_password - In case transfer method is FTP, this key must be set to user + password on server. + temporal - Path where the agent stores locally data before send them to the Pandora Server. The agent deletes the data every time it tries to connect to Pandora Server. diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc index 28bf0dcb72..249a415653 100644 --- a/pandora_agents/win32/pandora_windows_service.cc +++ b/pandora_agents/win32/pandora_windows_service.cc @@ -280,19 +280,6 @@ Pandora_Windows_Service::copyDataFile (string filename) pandoraLog ("Successfuly copied XML file to server."); } catch (Pandora_Exception e) { - if (getPandoraDebug () == false) { - string filepath; - - filepath = conf->getValue ("temporal"); - if (filepath[filepath.length () - 1] != '\\') { - filepath += "\\"; - } - filepath += filename; - try { - Pandora_File::removeFile (filepath); - } catch (Pandora_File::Delete_Error e) { - } - } } }