started webserver refactoring

debian/control

@@ -10,6 +10,6 @@ Package: fabscanpi-server
 Architecture: all
 Homepage: http://fabscan.org
 X-Python-Version: ${python:Versions}
-Depends: ${misc:Depends}, ${python:Depends},  python-opencv, libtbb2, python-pil, python-serial, python-pykka, python-picamera, python-rpi.gpio, python-semver, xvfb, meshlab, strace, avrdude, python-scipy
+Depends: ${misc:Depends}, ${python:Depends},  python-opencv, python-tornado, libtbb2, python-pil, python-serial, python-pykka, python-picamera, python-rpi.gpio, python-semver, xvfb, meshlab, strace, avrdude, python-scipy
 Description:
  FabScanPi Server ist the backend of the Stand-alone, Web-enabled, Open Source 3D laser scanner.

requirements.txt

@@ -3,4 +3,5 @@ pillow ==2.7
 Pykka >=1.2
 numpy >=1.9
 semver >=2.0
+tornado
 mock

src/fabscan/__init__.py

@@ -4,7 +4,7 @@
 __maintainer__ = "Mario Lukas"
 __email__ = "info@mariolukas.de"
 
-from fabscan.server import FSServer
+from fabscan.server import FSScanServer
 from fabscan.daemon import Daemon
 from fabscan.FSVersion import __version__
 import logging
@@ -28,10 +28,10 @@ def __init__(self, pidfile, configfile, basedir, host, port, debug, allowRoot, l
 
 
 	def run(self):
-        #server = FSServer(config_file)
-        #fabscan = FSServer(self._configfile, self._basedir, self._host, self._port, self._debug, self._allowRoot)
+        #server = FSScanServer(config_file)
+        #fabscan = FSScanServer(self._configfile, self._basedir, self._host, self._port, self._debug, self._allowRoot)
 
-		fabscan = FSServer(self._configfile)
+		fabscan = FSScanServer(self._configfile)
 		fabscan.run()
 
 def main():
@@ -130,7 +130,7 @@ def main():
             elif "restart" == args.daemon:
                 daemon.restart()
         else:
-            fabscan = FSServer(args.config, args.settings)
+            fabscan = FSScanServer(args.config, args.settings)
             fabscan.run()
     except Exception, e:
         logger.fatal("Fatal error: %s", e)