lateefj / Frisky / changeset / 7d32ad212ad5

Up to file-list .hgignore:

@@ -5,4 +5,4 @@ syntax: glob
 *~
 nohup.out
 log
-krisky.kpf
+kfrisky.kpf

Up to file-list TODO.txt:

 WSGI support:
  * SELECTOR
 Server Configuration:
  * Static files
    * regex configuration which can be integrated from older code
    * cache and compression
  * URL mapping
    * Map urls to web frameworks
    * Domain aliases
    * Redirect using regex
  * Other
    * Logging
    * Port
    * Restart using memento
      * import memento
      * app = memento.Assassin("frisky:frisky", ["frisky"])
 WSGI Frameworks:
  * Pylons
    * Controller support
    * Database support
    * Read the configuration file for serving static files
  * Django
    * Basic startup
    * Controller (whatever) support
    * Database support
    * Admin tool
    * read configuration for serving static files
  * TurboGears
    * Basic startup
    * Controller support
    * Database support
    * read configuration for serving static files (should be same as Pylons)
 Optimization:
  * Pyevent (could use python implementation for getting started (http://code.google.com/p/registeredeventlistener/))
    * pyprocessing using additional processes to increase peformance
  * Cython
    * Profile and use Cython on slowest/most used code
    * Use for more direct access to pyevent/libevent
  * Caching
    * Use high level cache
  * Static files
    * Use async push file system to server files
 Caching:
 Need to support cache invalidation programmatically and cache invalidation timeouts

Up to file-list frisky/httpd.py:

@@ -276,9 +276,9 @@ def test_handler(environ, reponse):
     return ['Hello World from test']
 from frisky import request
 #import memento
 #app = memento.Assassin("frisky:frisky", ["frisky"])
 import logging
 APP_MEMENTO = None
 class WSGIHandler(RequestHandler):
     """
     The only thing that this class must do is setup the
@@ -288,29 +288,45 @@ class WSGIHandler(RequestHandler):
     def handle_data(self):
         """
         Env vars needed
          * SCRIPT_NAME
          * QUERY_STING
         It basically does a brute force to populate the environ.
         """
         self.rfile.seek(0)
         # OPTIMIZATION: This could be done faster somehow
         content_length = len(self.rfile.read())
         # Parse the path to find the query string
         delimiter = self.path.find('?')
         query_string = ''
         if delimiter > 0:
             query_string = self.path[delimiter+1:]
         self.rfile.seek(0)
         lines = self.rfile.readlines()
-        env = {'PATH_INFO':self.path, }
+        env = {'PATH_INFO':self.path, 'CONTENT_LENGTH':content_length,
             'QUERY_STING':query_string}
         # OPTIMIZATION: The environ population could be made faster
         # with a better algorithm?
         headers = {}
         for l in lines:
             parts = l.split(':')
             if len(parts) > 1:
                 # Special WSGI population variable
                 if parts[0] == 'Host':
-                    env['SERVER_NAME'] = parts[1]
+                    env['SERVER_NAME'] = parts[1].strip()
                     if len(parts) > 2:
                         env['SERVER_PORT'] = parts[2]
                     else:
                         env['SERVER_PORT'] = 80
-                headers[parts[0]] = parts[1]
+                elif len(parts) > 2:
                     # if value has embeded : in it
                      headers[parts[0]] = ':'.join(parts[1:len(parts)]).strip()
                 else:
                     # If just simple name:value
                     headers[parts[0]] = parts[1].strip()
         environ = request.Environ()
         environ.update_method({'REQUEST_METHOD':self.command})
         environ.update_uri(env)
-        #print('headers %s' % self.headers)
+        #print('env %s' % env)
         environ.update_headers(headers)
         environ.update_headers(self.headers)
         #print('request line is %s' % self.parse_request())
@@ -319,18 +335,25 @@ class WSGIHandler(RequestHandler):
             'SCRIPT_NAME':self.path,
             'SERVER_PROTOCOL':self.request_version,
             })
-        environ.update_method({'REQUEST_METHOD':self.command})
         response = request.StartResponse()
         res = self.callback(environ, response)
         self.wfile.write(str(response))
         for r in res:
             self.wfile.write(r)
-        #print('Reqeust added to queue')
-def start(host='0.0.0.0', port=7777, callback=None):
+def start(host='0.0.0.0', port=7777, callback=None, packages=[]):
     """
     import memento
     for p in packages:
         APP_MEMENTO = memento.Assassin("%s:%s" % (p, p), ["%s" % p])
     """
     # launch the server on the specified port
     port = 7777
     s = Server(host, port, WSGIHandler, callback=callback)
     print "SimpleAsyncHTTPServer running on port %s" %port
     try:

Up to file-list frisky/oracle/io.py:

@@ -4,7 +4,7 @@ The io module is design to improve perfo
 import cStringIO
 import gzip
-from frisky import cache
+from frisky.oracle import cache
 CACHE_TYPE = cache.RAM

Up to file-list frisky/request.py:

@@ -133,8 +133,8 @@ class StartResponse:
             self.cookies[key] = ''
         self.cookies[key]['max-age'] = "0"
     def __str__(self):
         #res = "HTTP/1.1 %s %s\r\n" % (self.status_code, self.status_reasons)
         res=""
         res = "HTTP/1.1 %s %s\r\n" % (self.status_code, self.status_reasons)
         #res=""
         for key, val in self.response_headers.items():
             if key.upper() == "SET-COOKIE":
                 res += "%s\r\n" % val

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

@@ -8,5 +8,5 @@ from frisky import httpd
-httpd.start(callback=application)
+httpd.start(callback=application, packages=['pylons_sample'])

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

@@ -8,7 +8,13 @@ Note: Yaro performance is horrible so no
 import selector
 from frisky import httpd
 from frisky.oracle.io import optimize
 # It seems to have a small performance impact
 # not sure why but it is a bit slower using the cache
 # might just be more code in the way.
 # This is such an unrealistic example
 @optimize(compress=False, cache=True, cache_key='hello_name')
 def hello_name(environ, start_response):
     name = environ['selector.vars']['name']
     return ["Hello %s!" % name]

commit 6:	7d32ad212ad5
parent 5:	ac05bec4f8c8
branch:	default

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