X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUID.pm;h=a6b4c4bbd467df107d37efc13584839a1d47767f;hb=7c1c3170270e32df2d794b59b5498d48d68564a4;hp=065db61c1e076d43b98c05fde98dd455fa75de34;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1;p=freeside.git

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 065db61c1..a6b4c4bbd 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -2,8 +2,8 @@ package FS::UID;
 
 use strict;
 use vars qw(
-  @ISA @EXPORT_OK $cgi $dbh $freeside_uid $user 
-  $conf_dir $secrets $datasrc $db_user $db_pass %callback @callback
+  @ISA @EXPORT_OK $DEBUG $me $cgi $dbh $freeside_uid $user 
+  $conf_dir $cache_dir $secrets $datasrc $db_user $db_pass %callback @callback
   $driver_name $AutoCommit $callback_hack $use_confcompat
 );
 use subs qw(
@@ -20,9 +20,13 @@ use FS::CurrentUser;
                 getotaker dbh datasrc getsecrets driver_name myconnect
                 use_confcompat);
 
+$DEBUG = 0;
+$me = '[FS::UID]';
+
 $freeside_uid = scalar(getpwnam('freeside'));
 
-$conf_dir = "%%%FREESIDE_CONF%%%";
+$conf_dir  = "%%%FREESIDE_CONF%%%";
+$cache_dir = "%%%FREESIDE_CACHE%%%";
 
 $AutoCommit = 1; #ours, not DBI
 $use_confcompat = 1;
@@ -76,6 +80,7 @@ sub adminsuidsetup {
 sub forksuidsetup {
   $user = shift;
   my $olduser = $user;
+  warn "$me forksuidsetup starting for $user\n" if $DEBUG;
 
   if ( $FS::CurrentUser::upgrade_hack ) {
     $user = 'fs_bootstrap';
@@ -93,41 +98,54 @@ sub forksuidsetup {
   $ENV{'ENV'} = '';
   $ENV{'BASH_ENV'} = '';
 
-  croak "Not running uid freeside!" unless checkeuid();
+  croak "Not running uid freeside (\$>=$>, \$<=$<)\n" unless checkeuid();
 
+  warn "$me forksuidsetup connecting to database\n" if $DEBUG;
   if ( $FS::CurrentUser::upgrade_hack && $olduser ) {
     $dbh = &myconnect($olduser);
   } else {
     $dbh = &myconnect();
   }
+  warn "$me forksuidsetup connected to database with handle $dbh\n" if $DEBUG;
 
-  use FS::Schema qw(reload_dbdef);
+  warn "$me forksuidsetup loading schema\n" if $DEBUG;
+  use FS::Schema qw(reload_dbdef dbdef);
   reload_dbdef("$conf_dir/dbdef.$datasrc")
     unless $FS::Schema::setup_hack;
 
-  FS::CurrentUser->load_user($user);
+  warn "$me forksuidsetup deciding upon config system to use\n" if $DEBUG;
+
+  if ( ! $FS::Schema::setup_hack && dbdef->table('conf') ) {
 
-  if ($dbh && ! $callback_hack) {
     my $sth = $dbh->prepare("SELECT COUNT(*) FROM conf") or die $dbh->errstr;
     $sth->execute or die $sth->errstr;
     my $confcount = $sth->fetchrow_arrayref->[0];
-
+  
     if ($confcount) {
       $use_confcompat = 0;
     }else{
       warn "NO CONFIGURATION RECORDS FOUND";
     }
+
+  } else {
+    warn "NO CONFIGURATION TABLE FOUND";
   }
 
-  unless($callback_hack) {
+  unless ( $callback_hack ) {
+    warn "$me calling callbacks\n" if $DEBUG;
     foreach ( keys %callback ) {
       &{$callback{$_}};
       # breaks multi-database installs # delete $callback{$_}; #run once
     }
 
     &{$_} foreach @callback;
+  } else {
+    warn "$me skipping callbacks (callback_hack set)\n" if $DEBUG;
   }
 
+  warn "$me forksuidsetup loading user\n" if $DEBUG;
+  FS::CurrentUser->load_user($user);
+
   $dbh;
 }