tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-12-13 Ramon Novoa <rnovoa@artica.es> 

* win32/installer/pandora.mpi,
	  win32/pandora_windows_service.cc,
	  win32/pandora.cc,
	  unix/DEBIAN/control,
	  unix/DEBIAN/make_deb_package.sh,
	  unix/pandora_agent.spec,
	  unix/pandora_agent: Fixed version strings (were wrong
	  in the previous commit).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5254 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2011-12-13 14:37:32 +00:00
parent e4dd112e23
commit 9111758387
8 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_agents/ChangeLog
View File

@ -1,3 +1,14 @@
2011-12-13 Ramon Novoa <rnovoa@artica.es>
* win32/installer/pandora.mpi,
win32/pandora_windows_service.cc,
win32/pandora.cc,
unix/DEBIAN/control,
unix/DEBIAN/make_deb_package.sh,
unix/pandora_agent.spec,
unix/pandora_agent: Fixed version strings (were wrong
in the previous commit).
2011-12-13 Ramon Novoa <rnovoa@artica.es> 2011-12-13 Ramon Novoa <rnovoa@artica.es>
* win32/pandora_windows_service.cc: Brokers do not need to * win32/pandora_windows_service.cc: Brokers do not need to

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: final Version: 4.0.1
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="final" pandora_version="4.0.1"
echo "Test if you has the tools for to make the packages." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -52,7 +52,7 @@ if (!$@) {
threads::shared::share (\$Sem); threads::shared::share (\$Sem);
} }
use constant AGENT_VERSION => 'final'; use constant AGENT_VERSION => '4.0.1';
use constant AGENT_BUILD => '111213'; use constant AGENT_BUILD => '111213';
# Commands to retrieve total memory information in kB # Commands to retrieve total memory information in kB

2
pandora_agents/unix/pandora_agent.spec
View File

@ -2,7 +2,7 @@
#Pandora FMS Linux Agent #Pandora FMS Linux Agent
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version final %define version 4.0.1
%define release 1 %define release 1
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version

4
pandora_agents/win32/installer/pandora.mpi
View File

@ -3,7 +3,7 @@ AllowLanguageSelection
{Yes} {Yes}
AppName AppName
{Pandora FMS Windows Agent vfinal} {Pandora FMS Windows Agent v4.0.1}
ApplicationID ApplicationID
{17E3D2CF-CA02-406B-8A80-9D31C17BD08F} {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@ -75,7 +75,7 @@ InstallPassword
{} {}
InstallVersion InstallVersion
{final.0.0} {4.0.0.0}
Language,ca Language,ca
{No} {No}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils; using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1 #define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("final(Build 111213)") #define PANDORA_VERSION ("4.0.1(Build 111213)")
string pandora_path; string pandora_path;
string pandora_dir; string pandora_dir;

11
pandora_agents/win32/pandora_windows_service.cc
View File

@ -206,6 +206,7 @@ Pandora_Windows_Service::pandora_init () {
string udp_server_enabled, udp_server_port, udp_server_addr, udp_server_auth_addr; string udp_server_enabled, udp_server_port, udp_server_addr, udp_server_auth_addr;
string name_agent, name; string name_agent, name;
string proxy_mode, server_ip; string proxy_mode, server_ip;
string *all_conf;
int pos, num; int pos, num;
static unsigned char first_run = 1; static unsigned char first_run = 1;
@ -215,7 +216,7 @@ Pandora_Windows_Service::pandora_init () {
conf_file += "pandora_agent.conf"; conf_file += "pandora_agent.conf";
num = count_broker_agents(); num = count_broker_agents();
string all_conf[num]; all_conf = new string[num];
this->conf = Pandora::Pandora_Agent_Conf::getInstance (); this->conf = Pandora::Pandora_Agent_Conf::getInstance ();
this->conf->setFile (all_conf); this->conf->setFile (all_conf);
@ -223,6 +224,7 @@ Pandora_Windows_Service::pandora_init () {
delete this->modules; delete this->modules;
} }
this->modules = new Pandora_Module_List (conf_file); this->modules = new Pandora_Module_List (conf_file);
delete []all_conf;
name = checkAgentName(conf_file); name = checkAgentName(conf_file);
if (name.empty ()) { if (name.empty ()) {
@ -1455,7 +1457,7 @@ if (this->elapsed_transfer_time >= this->transfer_interval) {
void void
Pandora_Windows_Service::pandora_run () { Pandora_Windows_Service::pandora_run () {
Pandora_Agent_Conf *conf = NULL; Pandora_Agent_Conf *conf = NULL;
string server_addr, conf_file; string server_addr, conf_file, *all_conf;
int startup_delay = 0; int startup_delay = 0;
static unsigned char delayed = 0; static unsigned char delayed = 0;
int exe = 1; int exe = 1;
@ -1536,13 +1538,14 @@ Pandora_Windows_Service::pandora_run () {
/* Load and execute brokers */ /* Load and execute brokers */
num = count_broker_agents(); num = count_broker_agents();
string all_conf[num]; all_conf = new string [num];
check_broker_agents(all_conf); check_broker_agents(all_conf);
for (i=0;i<num;i++){ for (i=0;i<num;i++){
pandora_init_broker(all_conf[i]); pandora_init_broker(all_conf[i]);
pandora_run_broker(all_conf[i]); pandora_run_broker(all_conf[i]);
} }
delete []all_conf;
/* Reload the original configuration */ /* Reload the original configuration */
if (num != 0) { if (num != 0) {
pandora_init (); pandora_init ();