CherryPy server picking up config and serving static form file.

Casey Boettcher · Casey Boettcher · commit 861efdb69f5c · 2017-09-27T14:13:28.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ out
 *.out
 gen
 test/xforce.cfg
+notes.txt
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
 requests>=2.18.4
 IPy>=0.83
+CherryPy>=11.0.0
diff --git a/web/server.cfg b/web/server.cfg
@@ -0,0 +1,7 @@
+
+[/]
+tools.sessions.on: True
+tools.staticdir.on = True
+tools.staticdir.root = os.path.abspath('.')
+tools.staticdir.dir = os.path.join(os.path.abspath('.'), 'web')
+tools.staticdir.index = "xfipchk.html"
diff --git a/web/webui.py b/web/webui.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+
+import cherrypy
+import os
+import io
+
+
+class XforceForm(object):
+    def __init__(self, address='127.0.0.1', port=8000):
+        cherrypy.config.update({'tools.staticdir.debug': True})
+        # cherrypy.config.update('web/server.cfg')
+        # parms override anything in config
+        cherrypy.config.update({'server.socket_port': port,
+                                'server.socket_host': address})
+
+    # def start_server(self):
+    #    cherrypy.quickstart(XforceForm(), '/', './web/server.cfg')
+
+    @cherrypy.expose
+    def index(self):
+        return "/"
+
+
+if __name__ == '__main__':
+    cherrypy.quickstart(XforceForm())
diff --git a/xfipchk.py b/xfipchk.py
@@ -16,8 +16,9 @@
 import argparse
 import requests
 import IPy
-import http.server
-import socketserver
+import web.webui
+import cherrypy
+
 
 XFORCE_API_BASE = 'https://api.xforce.ibmcloud.com'
 XFORCE_API_IP_REP = 'ipr'
@@ -147,7 +148,7 @@ def call_xforce_api(address_list, key, password):
     """
     results = []
     for a in address_list:
-        url = "{}/{}/{}".format(XFORCE_API_BASE, XFORCE_API_IP_REP, a)
+        url = "{}/{}/{}".foGrmat(XFORCE_API_BASE, XFORCE_API_IP_REP, a)
         results.append(requests.get(url, auth=(key, password)).json())
     return results
 
@@ -179,12 +180,9 @@ def print_json_file(results, file):
         file.write('######################################\n')
 
 
-def start_server(ip_address="127.0.0.1", port=8000):
-    # we want to serve out of the web directory
-    handler = http.server.SimpleHTTPRequestHandler
-    with socketserver.TCPServer((ip_address, port), handler) as httpd:
-        print("Starting HTTP server on port {0}".format(port))
-        httpd.serve_forever()
+def start_server(address='127.0.0.1', port=8000):
+    webapp = web.webui.XforceForm(address, port)
+    cherrypy.quickstart(webapp, '/', './web/server.cfg')
 
 
 def main():

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`requests>=2.18.4`
`2`	`2`	`IPy>=0.83`
	`3`	`+CherryPy>=11.0.0`