From 4f91b4bf4e57e9fb27c9c4193c87c56897533a35 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 20 Jun 2006 14:07:59 +0000
Subject: [PATCH]  - Fixed a memory leak in Spectre that could cause it to
 double in size    roughly every 30 hours under certain conditions.

---
 docs/changelog/6.x.x.txt | 2 ++
 lib/Spectre/Cron.pm      | 3 ++-
 lib/Spectre/Workflow.pm  | 9 +++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index aa6c05dbb..7d35f2355 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -2,6 +2,8 @@
  - fix: Add a Related Product not working
  - fix: Edit button missing in timetracker projects
  - fix: Upgrade from 6.8.10 to 6.99.4 failed
+ - Fixed a memory leak in Spectre that could cause it to double in size
+   roughly every 30 hours under certain conditions.
 
 
 6.99.4
diff --git a/lib/Spectre/Cron.pm b/lib/Spectre/Cron.pm
index 6995ca541..beac5c73a 100644
--- a/lib/Spectre/Cron.pm
+++ b/lib/Spectre/Cron.pm
@@ -256,6 +256,7 @@ The config file name for the site this job belongs to.
 sub deleteJob {
 	my ($self, $params) = @_[OBJECT, ARG0];
 	$self->debug("Deleting schedule ".$params->{taskId}." for ".$params->{config}." from queue.");
+	delete $self->{_errorCount}{$params->{config}}{$params->{taskId}};
 	delete $self->{_jobs}{$params->{config}}{$params->{taskId}};
 }
 
@@ -418,7 +419,7 @@ sub runJobResponse {
 		}
 		my $state = $response->content; 
 		if ($state eq "done") {
-			$self->{_errorCount}{$config}{$taskId} = 0;
+			delete $self->{_errorCount}{$config}{$taskId};
 			$self->debug("Scheduled task $config / $taskId is now complete.");
 			if ($job->{runOnce}) {
 				$kernel->yield("deleteJob",{config=>$job->{config}, taskId=>$job->{taskId}});
diff --git a/lib/Spectre/Workflow.pm b/lib/Spectre/Workflow.pm
index 38e27f22f..aca689f9a 100644
--- a/lib/Spectre/Workflow.pm
+++ b/lib/Spectre/Workflow.pm
@@ -18,6 +18,7 @@ use strict;
 use HTTP::Request::Common;
 use POE;
 use POE::Component::Client::UserAgent;
+use WebGUI::Session;
 
 #-------------------------------------------------------------------
 
@@ -189,6 +190,7 @@ sub deleteInstance {
 	$self->debug("Deleting workflow instance $instanceId from instance queue.");
 	if ($self->{_instances}{$instanceId}) {
 		my $priority = $self->{_instances}{$instanceId}{priority};
+		delete $self->{_errorCount}{$instanceId};
 		delete $self->{_instances}{$instanceId};
 		for (my $i=0; $i < scalar(@{$self->{"_priority".$priority}}); $i++) {
 			if ($self->{"_priority".$priority}[$i] eq $instanceId) {
@@ -398,19 +400,18 @@ sub workerResponse {
 		}
 		my $state = $response->content; 
 		if ($state eq "waiting") {
-			$self->{_errorCount}{$instanceId}=0;
+			delete $self->{_errorCount}{$instanceId};
 			$self->debug("Was told to wait on $instanceId because we're still waiting on some external event.");
 			$kernel->yield("suspendInstance",$instanceId);
 		} elsif ($state eq "complete") {
-			$self->{_errorCount}{$instanceId}=0;
+			delete $self->{_errorCount}{$instanceId};
 			$self->debug("Workflow instance $instanceId ran one of it's activities successfully.");
 			$kernel->yield("returnInstanceToQueue",$instanceId);
 		} elsif ($state eq "disabled") {
-			$self->{_errorCount}{$instanceId}=0;
+			delete $self->{_errorCount}{$instanceId};
 			$self->debug("Workflow instance $instanceId is disabled.");
 			$kernel->yield("suspendInstance",$instanceId);			
 		} elsif ($state eq "done") {
-			$self->{_errorCount}{$instanceId}=0;
 			$self->debug("Workflow instance $instanceId is now complete.");
 			$kernel->yield("deleteInstance",$instanceId);			
 		} elsif ($state eq "error") {