/[glsr]/trunk/harmonious/server/server.py
Gentoo

Diff of /trunk/harmonious/server/server.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 108 Revision 109
590 590
591 return harm 591 return harm
592 592
593 def do_GET(self): 593 def do_GET(self):
594 594
595 print self.headers
595 self.__perform_request() 596 self.__perform_request()
596 597
597 def do_HEAD(self): 598 def do_HEAD(self):
598 599
599 self.__perform_request() 600 self.__perform_request()
652 653
653 print "\n%s Starting up...\n" % __modulename__ 654 print "\n%s Starting up...\n" % __modulename__
654 655
655 server._startup_time = time.time() 656 server._startup_time = time.time()
656 657
657 print "Reading configuration..." 658 #print "Reading configuration..."
658 659
659 server.config = Config(sys.argv[1]) 660 server.config = Config(sys.argv[1])
660 server.config._read_config() 661 server.config._read_config()
661 662
662 server._errorLog = ErrorLog(server.config.logging['ErrorLog']) 663 server._errorLog = ErrorLog(server.config.logging['ErrorLog'])
663 server._accessLog = AccessLog(server.config.logging['AccessLog']) 664 server._accessLog = AccessLog(server.config.logging['AccessLog'])
664 665
665 if server.config.session['SessionEnable'] == True: 666 if server.config.session['SessionEnable'] == True:
666 server._sessionStore = SessionStorage(server.config.session['StorageType']) 667 server._sessionStore = SessionStorage(server.config.session['StorageType'])
668 server._sessionStore.load_store()
667 else: 669 else:
668 server._sessionStore = None 670 server._sessionStore = None
669 671
670 map_hosts() 672 map_hosts()
671 673
693# except OSError, e: 695# except OSError, e:
694# print >> sys.stderr, "Failed to fork daemon process: %d '%s'" % (e.errno, e.strerror) 696# print >> sys.stderr, "Failed to fork daemon process: %d '%s'" % (e.errno, e.strerror)
695# sys.exit(1) 697# sys.exit(1)
696 698
697 699
700 server._sessionStore.save_store()
698 print "Server Online." 701 print "Server Online."
699 print >> server._accessLog, "Server Online" 702 print >> server._accessLog, "Server Online"

Legend:
Removed from v.108  
changed lines
  Added in v.109

  ViewVC Help
Powered by ViewVC 1.1.20