Changeset 11201

Timestamp:

08/14/08 15:01:58 (5 months ago)

Author:

/C=ES/O=Warp Networks S.L./CN=ejhernandez@…

Message:

Added support for starting script (previously known as soap) from cmd line refs #1103

Location:

branches/remote-services/ebox/src

Files:

• EBox/Auth.pm (modified) (4 diffs)
• EBox/CGI/Login/Index.pm (modified) (1 diff)
• libexec/Makefile.am (modified) (1 diff)
• libexec/ebox-start-script-session (added)

branches/remote-services/ebox/src/EBox/Auth.pm

@@ -36 +36 @@
 # By now, the expiration time for session is hardcoded here
 use constant EXPIRE => 3600; #In seconds  1h
-# By now, the expiration time for a SOAP session
-use constant MAX_SOAP_SESSION => 10; # In seconds
+# By now, the expiration time for a script session
+use constant MAX_SCRIPT_SESSION => 10; # In seconds
 
 sub new 
@@ -160 +160 @@
     my ($self, $r, $passwd) = @_;
 
-    # If there's a SOAP session opened, give it priority to the
+    # If there's a script session opened, give it priority to the
     # Web interface session
-    if ( $self->_activeSOAPSession() ){
-      EBox::warn('Failed login since a SOAP session is opened');
-      $r->subprocess_env(LoginReason => 'SOAP active');
+    if ( $self->_actionScriptSession() ){
+      EBox::warn('Failed login since a script session is opened');
+      $r->subprocess_env(LoginReason => 'Script active');
       return;
     }
@@ -199 +199 @@
     my $expired =  _timeExpired($lastime);
 
-    if ( $self->_activeSOAPSession() ) {
-      $r->subprocess_env(LoginReason => 'SOAP active');
+    if ( $self->_actionScriptSession() ) {
+      $r->subprocess_env(LoginReason => 'Script active');
       _savesession(undef);
     }
@@ -296 +296 @@
 }
 
-# Method: _activeSOAPSession
-#
-#       Check whether a SOAP session is already opened or not
+# Method: _actionScriptSession
+#
+#       Check whether a script session is already opened or not
 #
 # Returns:
 #
-#       Boolean - indicate if a SOAP session is already opened
-#
-sub _activeSOAPSession
+#       Boolean - indicate if a script session is already opened
+#
+sub _actionScriptSession
   {
 
     my ($self) = @_;
 
-    # The SOAP session filehandle
-    my $soapSessionFile;
-
-    unless ( -e EBox::Config->soapSession() ){
+    # The script session filehandle
+    my $scriptSessionFile;
+
+    unless ( -e EBox::Config->scriptSession() ){
       return undef;
     }
 
-    # Trying to open the soap sid
-    open( $soapSessionFile, '<', EBox::Config->soapSession() ) or
+    # Trying to open the script sid
+    open( $scriptSessionFile, '<', EBox::Config->scriptSession() ) or
       throw EBox::Exceptions::Internal('Could not open ' .
-                                       EBox::Config->soapSession());
+                                       EBox::Config->scriptSession());
 
     # Lock in shared mode
-    flock($soapSessionFile, LOCK_SH)
+    flock($scriptSessionFile, LOCK_SH)
       or throw EBox::Exceptions::Lock($self);
 
     # The file structure is the following:
     # TIMESTAMP
-    my ($timeStamp) = <$soapSessionFile>;
+    my ($timeStamp) = <$scriptSessionFile>;
 
     # Release the lock and close the file
-    flock($soapSessionFile, LOCK_UN);
-    close($soapSessionFile);
+    flock($scriptSessionFile, LOCK_UN);
+    close($scriptSessionFile);
 
     # time() return the # of seconds since an epoch (1 Jan 1970
     # typically)
 
-    my $expireTime = $timeStamp + MAX_SOAP_SESSION;
+    my $expireTime = $timeStamp + MAX_SCRIPT_SESSION;
     return ( $expireTime >= time() );
 

branches/remote-services/ebox/src/EBox/CGI/Login/Index.pm

@@ -58 +58 @@
 
         my $reason;
-        if ( (defined ($envre) ) and ($envre eq 'SOAP active') ) {
-          $reason = __('There is a Web service script running. ' .
+        if ( (defined ($envre) ) and ($envre eq 'Script active') ) {
+          $reason = __('There is a script which has asked to run in eBox exclusively. ' .
                        'Please, wait patiently until it is done');
         }

branches/remote-services/ebox/src/libexec/Makefile.am

@@ -3 +3 @@
 scriptsdir = @DATADIR@/ebox
 
-scripts_SCRIPTS = ebox-loggerd ebox-kill-pid 
+scripts_SCRIPTS = ebox-loggerd ebox-kill-pid ebox-start-script-session
 
 MAINTAINERCLEANFILES = Makefile.in