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

2010-10-04 Ramon Novoa <rnovoa@artica.es> 

* plugins/inventory: Fixed inventory process information.

	* pandora_agent: Fixed an error that showed when no logfile was
	  specified in the agent configuration file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3338 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2010-10-04 17:22:28 +00:00
parent 3a333c37bf
commit f3b062d6ed
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_agents/unix/ChangeLog
View File

@ -1,3 +1,10 @@
2010-10-04 Ramon Novoa <rnovoa@artica.es>
* plugins/inventory: Fixed inventory process information.
* pandora_agent: Fixed an error that showed when no logfile was
specified in the agent configuration file.
2010-09-27 Junichi Satoh <junichi@rworks.jp> 2010-09-27 Junichi Satoh <junichi@rworks.jp>
* FreeBSD/pandora_agent: Fixed a typo. * FreeBSD/pandora_agent: Fixed a typo.

9
pandora_agents/unix/pandora_agent
View File

@ -400,8 +400,14 @@ sub read_config (;$) {
} }
} }
# Token not found
if (defined ($token)) {
close (CONF_FILE);
return undef;
}
# Update the agent MD5 since agent_name may have changed # Update the agent MD5 since agent_name may have changed
$AgentMD5 = md5 ($Conf{'agent_name'}) unless (defined ($token)); $AgentMD5 = md5 ($Conf{'agent_name'});
$RemoteConfFile = "$AgentMD5.conf"; $RemoteConfFile = "$AgentMD5.conf";
$RemoteMD5File = "$AgentMD5.md5"; $RemoteMD5File = "$AgentMD5.md5";
@ -409,7 +415,6 @@ sub read_config (;$) {
$ThreadSem = Thread::Semaphore->new ($Conf{'agent_threads'}) if defined ($Sem); $ThreadSem = Thread::Semaphore->new ($Conf{'agent_threads'}) if defined ($Sem);
close (CONF_FILE); close (CONF_FILE);
return '';
} }
################################################################################ ################################################################################

2
pandora_agents/unix/plugins/inventory
View File

@ -93,7 +93,7 @@ sub get_servicies_init_machine($$) {
sub get_processes ($$) { sub get_processes ($$) {
my ($name, $modules) = @_; my ($name, $modules) = @_;
my $script = "ps aux"; my $script = "ps -eo command";
my @services = `$script`; my @services = `$script`;
foreach my $row (@services) { foreach my $row (@services) {