lateefj / Frisky / changeset / 8ebc1bf36ca1

Up to file-list TODO.txt:

 Priorities:
  * Runs WSGI in seperate process for stability and performance
  * Create configuration file and support features listed below
@@ -56,6 +55,8 @@ grok - http://faassen.n--tree.net/blog/v
 werkzeug - http://dev.timparkin.co.uk/2009/01/werkzeug-and-werkzeugish-example.html
 repoze - http://blog.delaguardia.com.mx/index.php?op=ViewArticle&articleId=119&blogId=1
 Static server blog - http://jtauber.com/blog/2009/01/26/serving_up_user_contributed_media_from_a_separate_server/
 Caching:
 Need to support cache invalidation programmatically and cache invalidation
 timeouts

Up to file-list frisky/httpd.py:

@@ -352,8 +352,8 @@ class WSGIHandler(RequestHandler):
         # or can we pass the socket to write to ? Maybe can just pass
         # socket and it will work. Probably worth a try.
         if f is None:
             #f = proc.process_request_callback(self.callback, environ, response)
             f = self.callback(environ, response)
             f = proc.process_request_callback(server.CONFIG_FILE, environ, response)
             #f = self.callback(environ, response)
         # Write out the header
         self.wfile.write(str(response))
@@ -378,7 +378,7 @@ def start(host='0.0.0.0', port=7777, cal
     """
     # launch the server on the specified port
     s = Server(host, port, WSGIHandler, callback=callback)
-    print "SimpleAsyncHTTPServer running on port %s" %port
+    print "SimpleAsyncHTTPServer running on port %s" % port
     try:
         asyncore.loop(timeout=2)
     except KeyboardInterrupt:

Up to file-list frisky/proc.py:

@@ -5,9 +5,10 @@ try:
 	#2.6+ processing compatability
 	from multiprocessing import Pool, Queue
 except:
+	# 2.5 lowest support
 	from processing import Pool, Queue
 from frisky import server
 log = logging.getLogger(name=__name__)
 # TODO: THIS NEED TO BE CONFIGUREATION!!
 REQUEST_TIMEOUT = 30
@@ -19,19 +20,18 @@ def create_pool():
 	global pool
 	pool = Pool(PROCESSES)
 def handle_wsgi_request(callback, environ, response):
 	return callback(environ, response)
 def handle_wsgi_request(config_file, environ, response):
 	if not server.CONFIGURED:
 		server.load_config_file(config_file)
 	#print('WSGI APPLICATION IS %s' % server.WSGI_APPLICATION)
 	return server.WSGI_APPLICATION(environ, response)
-def process_request_callback(callback, environ, response):
+def process_request_callback(config_file, environ, response):
 	if pool is None:
 		create_pool()
 	for x in inspect.getmembers(callback):
 		print x
 	print('module %s and function %s and dir %s' % (callback.__module__, callback.__call__, dir(callback)))
 	result = pool.apply_async(handle_wsgi_request, (callback, environ, response))
 	result = pool.apply_async(handle_wsgi_request, (config_file, environ, response))
 	return result.get(timeout=REQUEST_TIMEOUT)

Up to file-list frisky/server.py:

@@ -14,7 +14,7 @@ def configure():
 """
 """
-FAWPS CODE need to rigure out how to attribute correctly
+FAWPS CODE TODO: figure out how to attribute correctly came from FAWPS code
 """
 def redirect(start_response, location, permanent=None):
     header=[('location',location),
@@ -37,8 +37,13 @@ import logging
 import logging.handlers
 import mimetypes
 import simplejson
 from frisky.oracle import io
 CONFIG_FILE = None
 STATIC_CONFIG = {}
 DOMAIN_ALIAS = []
@@ -48,6 +53,8 @@ LISTEN_PORT = 8080
 LOG_FORMAT = '%(asctime)s %(levelname)-8s %(message)s'
 LOG_DATEFORMAT = '%a, %d %b %Y %H:%M:%S'
 WSGI_APPLICATION = None
 DEFAULT_CONFIG = {
     'logging':{
         'level': logging.DEBUG,
@@ -59,7 +66,16 @@ DEFAULT_CONFIG = {
 CONFIGURED = False
 def configure(config):
     global CONFIGURED, WSGI_APPLICATION
     CONFIGURED = True
     if config.has_key('wsgi_callable'):
         callable = config['wsgi_callable']
         func = callable.split('.')[-1]
         im = '.'.join(callable.split('.')[:-1])
         # TODO: CLean this up so it isn't a rat nest.
         st = 'import %s\nglobal WSGI_APPLICATION\nWSGI_APPLICATION = %s.%s()' % (im, im, func)
         exec(st)
     if config.has_key('domain_aliases'):
         DOMAIN_ALIAS.extend(config['domain_aliases'])
     if config.has_key('url_forwards'):
@@ -175,7 +191,8 @@ def handle_callback(environ, start_respo
     if find_static_path(environ['PATH_INFO']):
         try:
             fpath = find_file_path(environ['PATH_INFO'])
-            # Cache system
+            logging.debug('fpath is %s' % fpath)
             # Default cache to false
             cache_file = False
             if STATIC_CONFIG.has_key('CACHE') and STATIC_CONFIG['CACHE']['static']:
@@ -200,6 +217,16 @@ def handle_callback(environ, start_respo
         except FileNotFoundException, fnfe:
            logging.warning("File not found for path %s" % environ['PATH_INFO'])
     return None
 def load_config_file(config_file):
     print('Configuring with file %s' % config_file)
     f = open(config_file, 'r')
     config = simplejson.loads(f.read())
     configure(config)
 if len(sys.argv) > 1:
     CONFIG_FILE = sys.argv[1]
     load_config_file(CONFIG_FILE)

Up to file-list samples/selector_sample/run.py:

@@ -7,7 +7,7 @@ Note: Yaro performance is horrible so no
 import selector
-from frisky import httpd
+#from frisky import httpd
 from frisky.oracle.io import optimize
 # It seems to have a small performance impact
@@ -23,11 +23,13 @@ def hello(environ, start_response):
     return ["Hello from Frisky Selector sample"]
 if __name__ == '__main__':
 def wsgi_callable():
     SELECTOR = selector.Selector()
     SELECTOR.add('/', GET=hello)
     SELECTOR.add('/hello/{name}', GET=hello_name)
     return SELECTOR
 #if __name__ == '__main__':
-    httpd.start(callback=SELECTOR)
+    #httpd.start(callback=wsgi_callable())

commit 15:	8ebc1bf36ca1
parent 14:	12d5baa7906a
branch:	default

lateefj / Frisky (http://src.hackingthought.com/projects/frisky/)