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

2011-02-03 Ramon Novoa <rnovoa@artica.es> 

* win32/installer/pandora.mpi, win32/pandora.cc, unix/pandora_agent: Free
	  the threads semaphore when a module or plugin does not execute.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3796 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2011-02-03 09:44:04 +00:00
parent 76f68afcb9
commit bc89d98ab2
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_agents/ChangeLog
View File

@ -1,3 +1,8 @@
2011-02-03 Ramon Novoa <rnovoa@artica.es>
* win32/installer/pandora.mpi, win32/pandora.cc, unix/pandora_agent: Free
the threads semaphore when a module or plugin does not execute.
2011-02-01 Sergio Martin <sergio.martin@artica.es>
* android/AndroidManifest.xml

20
pandora_agents/unix/pandora_agent
View File

@ -818,13 +818,22 @@ sub exec_module ($) {
my $module = shift;
# Need something to execute
return unless ($module->{'func'} != 0);
if ($module->{'func'} == 0) {
$ThreadSem->up () if (defined ($ThreadSem) && $Conf{'agent_threads'} > 1);
return;
}
# Check module interval
return unless (++($module->{'counter'}) >= $module->{'interval'});
if (++($module->{'counter'}) < $module->{'interval'}) {
$ThreadSem->up () if (defined ($ThreadSem) && $Conf{'agent_threads'} > 1);
return;
}
# Check module cron
return unless (check_module_cron ($module) == 1);
if (check_module_cron ($module) != 1) {
$ThreadSem->up () if (defined ($ThreadSem) && $Conf{'agent_threads'} > 1);
return;
}
# Reset module counter
$module->{'counter'} = 0;
@ -1273,7 +1282,10 @@ sub exec_plugin ($) {
my $output = `$plugin 2>$DevNull`;
# Do not save the output if there was an error
return unless ($? eq 0);
if ($? != 0) {
$ThreadSem->up () if (defined ($ThreadSem) && $Conf{'agent_threads'} > 1);
return;
}
# Critical section
$Sem->down () if (defined ($Sem));

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{101227}
{101228}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

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