casserver.rb in gunark-rubycas-server-0.8.0.20090715

- old
+ new
@@ -26,14 +26,33 @@
 require "casserver/views"
 require "casserver/controllers"
 require "casserver/localization"
 
 def CASServer.create
-  CASServer::Models::Base.establish_connection($CONF[:database])
+  $LOG.info "Creating RubyCAS-Server with pid #{Process.pid}."
+
+
+  CASServer::Models::Base.establish_connection($CONF.database)
   CASServer::Models.create_schema
-  
-  CASServer::Models::ServiceTicket.cleanup_expired($CONF[:service_ticket_expiry])
-  CASServer::Models::LoginTicket.cleanup_expired($CONF[:login_ticket_expiry])
-  CASServer::Models::ProxyGrantingTicket.cleanup_expired($CONF[:proxy_granting_ticket_expiry])
-  CASServer::Models::TicketGrantingTicket.cleanup_expired($CONF[:ticket_granting_ticket_expiry])
+
+  #TODO: these warnings should eventually be deleted
+  if $CONF.service_ticket_expiry
+    $LOG.warn "The 'service_ticket_expiry' option has been renamed to 'maximum_unused_service_ticket_lifetime'. Please make the necessary change to your config file!"
+    $CONF.maximum_unused_service_ticket_lifetime ||= $CONF.service_ticket_expiry
+  end
+  if $CONF.login_ticket_expiry
+    $LOG.warn "The 'login_ticket_expiry' option has been renamed to 'maximum_unused_login_ticket_lifetime'. Please make the necessary change to your config file!"
+    $CONF.maximum_unused_login_ticket_lifetime ||= $CONF.login_ticket_expiry
+  end
+  if $CONF.ticket_granting_ticket_expiry || $CONF.proxy_granting_ticket_expiry
+    $LOG.warn "The 'ticket_granting_ticket_expiry' and 'proxy_granting_ticket_expiry' options have been renamed to 'maximum_session_lifetime'. Please make the necessary change to your config file!"
+    $CONF.maximum_session_lifetime ||= $CONF.ticket_granting_ticket_expiry || $CONF.proxy_granting_ticket_expiry
+  end
+
+  if $CONF.maximum_session_lifetime
+    CASServer::Models::ServiceTicket.cleanup($CONF.maximum_session_lifetime, $CONF.maximum_unused_service_ticket_lifetime)
+    CASServer::Models::LoginTicket.cleanup($CONF.maximum_session_lifetime, $CONF.maximum_unused_login_ticket_lifetime)
+    CASServer::Models::ProxyGrantingTicket.cleanup($CONF.maximum_session_lifetime)
+    CASServer::Models::TicketGrantingTicket.cleanup($CONF.maximum_session_lifetime)
+  end
 end
 