From ddf3ecd5b4a3f24d01361a3114d785e75d334273 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Wed, 5 Jan 2011 09:10:21 -0800 Subject: [PATCH] Instead of looking up the gateway from the config file, use the request object's base method. --- lib/WebGUI/Operation/Spectre.pm | 2 +- lib/WebGUI/Workflow/Instance.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/WebGUI/Operation/Spectre.pm b/lib/WebGUI/Operation/Spectre.pm index fcc2575c6..0b63a3eab 100644 --- a/lib/WebGUI/Operation/Spectre.pm +++ b/lib/WebGUI/Operation/Spectre.pm @@ -65,7 +65,7 @@ sub www_spectreGetSiteData { } else { my $sitename = $session->config->get("sitename")->[0]; - my $gateway = $session->config->get("gateway"); + my $gateway = $session->request->base->path; my $cookieName = $session->config->getCookieName; my @instances = (); foreach my $instance (@{WebGUI::Workflow::Instance->getAllInstances($session)}) { diff --git a/lib/WebGUI/Workflow/Instance.pm b/lib/WebGUI/Workflow/Instance.pm index c999c8994..c68dc469c 100644 --- a/lib/WebGUI/Workflow/Instance.pm +++ b/lib/WebGUI/Workflow/Instance.pm @@ -607,7 +607,7 @@ sub set { if ($self->{_started} && !$skipNotify) { my $spectre = WebGUI::Workflow::Spectre->new($self->session); $spectre->notify("workflow/deleteInstance",$self->getId); - $spectre->notify("workflow/addInstance", {cookieName=>$self->session->config->getCookieName, gateway=>$self->session->config->get("gateway"), sitename=>$self->session->config->get("sitename")->[0], instanceId=>$self->getId, priority=>$self->{_data}{priority}}); + $spectre->notify("workflow/addInstance", {cookieName=>$self->session->config->getCookieName, gateway=>$self->session->request->base->path, sitename=>$self->session->config->get("sitename")->[0], instanceId=>$self->getId, priority=>$self->{_data}{priority}}); } } @@ -675,7 +675,7 @@ sub start { # hand off the workflow to spectre $log->info('Could not complete workflow instance '.$self->getId.' in realtime, handing off to Spectre.'); my $spectre = WebGUI::Workflow::Spectre->new($self->session); - $spectre->notify("workflow/addInstance", {cookieName=>$self->session->config->getCookieName, gateway=>$self->session->config->get("gateway"), sitename=>$self->session->config->get("sitename")->[0], instanceId=>$self->getId, priority=>$self->{_data}{priority}}); + $spectre->notify("workflow/addInstance", {cookieName=>$self->session->config->getCookieName, gateway=>$self->session->request->base->path, sitename=>$self->session->config->get("sitename")->[0], instanceId=>$self->getId, priority=>$self->{_data}{priority}}); my $spectreTest = WebGUI::Operation::Spectre::spectreTest($self->session); if($spectreTest ne "success"){