Merge branch 'master' of github.com:kliment/Printrun

prontserve.py

@@ -469,6 +469,7 @@ class Prontserve(pronsole.pronsole, EventEmitter):
     self.jobs.listeners.add(self)
     self.initializing = False
 
+  def start(self):
     if self.dry_run == False:
       self.do_connect("")
       if self.p.printer == None: sys.exit(1)
@@ -892,18 +893,26 @@ if __name__ == "__main__":
     help='Enables verbose printer output'
   )
 
+  parser.add_argument('--heaptrace', default=False, action='store_true',
+    help='Enables a heap trace on exit (for developer use)'
+  )
+
   args = parser.parse_args()
   dry_run = args.dry_run
 
+  if args.heaptrace:
+    from guppy import hpy
+
   def warn_if_dry_run():
     if dry_run:
       for i in range(0,7):
         sys.stdout.write("\x1B[0;33m  Dry Run  \x1B[0m")
     print ""
 
-  try:
-    prontserve = Prontserve(dry_run=dry_run, loud=args.loud)
+  prontserve = Prontserve(dry_run=dry_run, loud=args.loud)
 
+  try:
+    prontserve.start()
     application.listen(8888)
     print "\n"+"-"*80
     welcome = textwrap.dedent(u"""
@@ -918,4 +927,6 @@ if __name__ == "__main__":
 
     prontserve.ioloop.start()
   except:
+    if args.heaptrace: print hpy().heap()
     prontserve.p.disconnect()
+    exit()

requirements.txt

 pybonjour
-git+https://github.com/nephics/tornado.git
+git+https://github.com/D1plo1d/tornado.git
 git+https://github.com/D1plo1d/py-mdns.git