X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-selfservice-server;h=c10623c9688edb58e1683af50e226686cbe5eba1;hp=2087e71306298f75f8070e138f21a00faf21693a;hb=aed8ec35ccb9cdeb7ea0cb6ff2946f9d83d582f6;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1 diff --git a/FS/bin/freeside-selfservice-server b/FS/bin/freeside-selfservice-server index 2087e7130..c10623c96 100644 --- a/FS/bin/freeside-selfservice-server +++ b/FS/bin/freeside-selfservice-server @@ -13,11 +13,13 @@ use Storable 2.09 qw(nstore_fd fd_retrieve); use Net::SSH qw(sshopen2); use FS::Daemon qw(daemonize1 drop_root logfile daemonize2 sigint sigterm); use FS::UID qw(adminsuidsetup forksuidsetup); -use FS::ClientAPI; +use FS::ClientAPI qw( load_clientapi_modules ); use FS::ClientAPI_SessionCache; +use FS::Record qw( qsearch qsearchs ); use FS::Conf; use FS::cust_svc; +use FS::agent; $FREESIDE_LOG = "%%%FREESIDE_LOG%%%"; $FREESIDE_LOCK = "%%%FREESIDE_LOCK%%%"; @@ -50,6 +52,8 @@ drop_root(); $ENV{HOME} = (getpwuid($>))[7]; #for ssh +load_clientapi_modules; + adminsuidsetup $user; #logfile("/usr/local/etc/freeside/selfservice.". $FS::UID::datasrc); #MACHINE @@ -70,6 +74,13 @@ my $cache = new FS::ClientAPI_SessionCache( { } ); $cache->remove('signup_info_cache'); +#and also clear the selfservice skin info cache, for the same reason +my $ss_cache = new FS::ClientAPI_SessionCache( { + 'namespace' => 'FS::ClientAPI::MyAccount', +} ); +$ss_cache->remove($_) + foreach grep /^skin_info_cache_agent/, $ss_cache->get_keys(); + my $clientd = "/usr/local/sbin/freeside-selfservice-clientd"; #better name? my $warnkids=0; @@ -97,7 +108,31 @@ while (1) { if ( $keepalives && $keepalive_count++ > 10 ) { $keepalive_count = 0; lock_write; + nstore_fd( { _token => '_keepalive' }, $writer ); + +#commenting izoom stuff out until we can move it to a branch (or just remove) +# foreach my $agent ( qsearch( 'agent', { disabled => '' } ) ) { +# my $config = qsearchs( 'conf', { name => 'selfservice-bulk_ftp_dir', +# agentnum => $agent->agentnum, +# } ) +# or next; +# +# my $session = +# FS::ClientAPI->dispatch( 'Agent/agent_login', +# { username => $agent->username, +# password => $agent->_password, +# } +# ); +# +# nstore_fd( { _token => '_ftp_scan', +# dir => $config->value, +# session_id => $session->{session_id}, +# }, +# $writer +# ); +# } + unlock_write; } next;