Tadashi Okoshi
slash****@users*****
2006年 4月 15日 (土) 04:35:27 JST
Index: affelio/lib/Affelio.pm
diff -u affelio/lib/Affelio.pm:1.41 affelio/lib/Affelio.pm:1.42
--- affelio/lib/Affelio.pm:1.41 Tue Mar 28 18:15:22 2006
+++ affelio/lib/Affelio.pm Sat Apr 15 04:35:27 2006
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: Affelio.pm,v 1.41 2006/03/28 09:15:22 slash5234 Exp $
+# $Id: Affelio.pm,v 1.42 2006/04/14 19:35:27 slash5234 Exp $
package Affelio;
{
@@ -399,7 +399,7 @@
if($self->{site__farm_mode} eq "AFE2"){
debug_print("Affelio::loadSM: getting SM from AFE2...");
- $self->{sm} = $self->{farm_con}->getSM();
+ $self->{sm} = $self->{farm_con}->getSM($self);
if(!$self->{sm}){
throw Affelio::exception::SystemException("affelio.cfg: cannot obtain SessionManager from FarmConnector.");
}
@@ -661,7 +661,11 @@
######################################################################
sub get_farm_connecter{
my $self = shift;
+
if( !($self->{farm_con}) ){
+ #########################################
+ #if farm connecter has not been loaded...
+ #########################################
require Config::Tiny;
my $Config = Config::Tiny->new();
@@ -669,7 +673,6 @@
if($@ || !$Config){
throw Affelio::exception::SystemException("affelio.cfg not found");
}
-
$self->{farm__connecter_path} = $Config->{affelio_farm}->{farm_connecter};
if(($self->{farm__connecter_path} eq "" )
|| !($self->{farm__connecter_path}) ){
@@ -693,7 +696,6 @@
throw Affelio::exception::SystemException("Could not instantiate [$con_class].");
}
debug_print("Affelio::get_farm_con: con=[$self->{farm_con}]");
-
}
return($self->{farm_con});
@@ -722,25 +724,23 @@
##############################################
#[site] / Farm mode
##############################################
- #farm_mode
+ #Farm mode
if($ENV{FARM_MODE}){
+ #AFE2#############
$self->{site__farm_mode} = $ENV{FARM_MODE};
$self->{farm__connecter_path} = $ENV{FARM_CONNECTOR};
}else{
+ #AFE1#############
$self->{site__farm_mode} = $Config->{site_config}->{farm_mode};
- $self->{farm__connecter_path} =
- $Config->{affelio_farm}->{farm_connecter};
+ $self->{farm__connecter_path} = $Config->{affelio_farm}->{farm_connecter};
+ if(($self->{site__farm_mode} eq "") && ($self->{farm__connecter_path} ne "")){
+ $self->{site__farm_mode} = "AFE";
+ }
}
debug_print("Affelio::read_site_config: farm_mode=[$self->{site__farm_mode}]");
debug_print("Affelio::read_site_config: farm_con=[$self->{site__farm_connector}]");
- #Detect AFE (not 2)
- if(($self->{site__farm_mode} eq "")
- && ($self->{farm__connecter_path} ne "")){
- $self->{site__farm_mode} = "AFE";
- }
-
- #platform
+ #Platform
$self->{site__platform} = $Config->{site_config}->{platform};
debug_print("Affelio::read_site_config: platform=[$self->{site__platform}]");
@@ -781,22 +781,21 @@
##############################################
- #AFE
+ #AFE2
##############################################
if($self->{site__farm_mode} eq "AFE2"){
-
####################
#Load farm connecter
####################
my $clsname = "";
- $clsname = $self->{farm__connecter_path};
+ $clsname = $self->{farm__connecter_path} . "::" . $ENV{'REDIRECT_AF_EXEC_TYPE'} . "Farm";
debug_print("Affelio::read_site_config: AFE_con=[$clsname]");
eval "require $clsname; import $clsname;";
if($@){ throw Affelio::exception::SystemException("Could not load [$clsname]"); }
debug_print("Affelio::read_site_config: AFE_con [$clsname] loaded.");
$self->{farm_con} = eval "new $clsname;";
- $self->{farm_con}->init($self);
+ $self->{farm_con}->load_config();
####################
#farm__fs_data_root
@@ -831,8 +830,6 @@
#farm__web_farmroot
####################
$self->{farm__web_farmroot} = $ENV{'FARM_WEB_TOP'} . "/" . $ENV{'REDIRECT_AF_EXEC_TYPE'} . "Farm";
-
-
}
#if(AFE2)
@@ -913,12 +910,11 @@
}
debug_print("Affelio::read_site_config: site_tmpl_web_path = [$self->{site__tmpl_web_path}]");
-
##############################################
#[command]
##############################################
$self->{cmd__sendmail} = $Config->{command}->{sendmail};
-
+
#################################################################
#login.cfg
#################################################################
@@ -942,7 +938,7 @@
}else{
$self->{site__dbtbl_prefix} = "AF" . "user";
}
-
+ debug_print("Affelio::read_site_config: end.");
}
######################################################################