enable debug logging in examples; fix mpsrv.py example

6 files changed, 5 insertions, 13 deletions

diff --git a/examples/mpsrv.py b/examples/mpsrv.py
index daf55b1..d6f82d3 100755
--- a/examples/mpsrv.py
+++ b/examples/mpsrv.py
@@ -4,7 +4,6 @@
 import argparse
 import email.message
 import os
-import logging
 import socket
 import signal
 import time
@@ -116,7 +115,6 @@ class ChildProcess:
         # start server
         self.loop = loop = tulip.new_event_loop()
         tulip.set_event_loop(loop)
-        loop.set_log_level(logging.CRITICAL)
 
         def stop():
             self.loop.stop()
@@ -124,7 +122,7 @@ class ChildProcess:
         loop.add_signal_handler(signal.SIGINT, stop)
 
         f = loop.start_serving(lambda: HttpServer(debug=True), sock=self.sock)
-        x = loop.run_until_complete(f[0])
+        x = loop.run_until_complete(f)[0]
         print('Starting srv worker process {} on {}'.format(
             os.getpid(), x.getsockname()))
 
@@ -256,7 +254,6 @@ class Superviser:
 
     def __init__(self, args):
         self.loop = tulip.get_event_loop()
-        self.loop.set_log_level(logging.CRITICAL)
         self.args = args
         self.workers = []
 
diff --git a/examples/srv.py b/examples/srv.py
index aad0875..2c2ae91 100755
--- a/examples/srv.py
+++ b/examples/srv.py
@@ -151,7 +151,10 @@ def main():
         lambda: HttpServer(debug=True), args.host, args.port, ssl=sslcontext)
     socks = loop.run_until_complete(f)
     print('serving on', socks[0].getsockname())
-    loop.run_forever()
+    try:
+        loop.run_forever()
+    except KeyboardInterrupt:
+        pass
 
 
 if __name__ == '__main__':
diff --git a/examples/tcp_protocol_parser.py b/examples/tcp_protocol_parser.py
index 340f176..a025861 100755
--- a/examples/tcp_protocol_parser.py
+++ b/examples/tcp_protocol_parser.py
@@ -2,7 +2,6 @@
 """Protocol parser example."""
 import argparse
 import collections
-import logging
 import tulip
 try:
     import signal
@@ -162,7 +161,6 @@ if __name__ == '__main__':
         ARGS.print_help()
     else:
         loop = tulip.get_event_loop()
-        loop.set_log_level(logging.CRITICAL)
         if signal is not None:
             loop.add_signal_handler(signal.SIGINT, loop.stop)
 
diff --git a/examples/udp_echo.py b/examples/udp_echo.py
index d7bde29..0347bfb 100755
--- a/examples/udp_echo.py
+++ b/examples/udp_echo.py
@@ -3,7 +3,6 @@
 import argparse
 import sys
 import tulip
-import logging
 try:
     import signal
 except ImportError:
@@ -88,7 +87,6 @@ if __name__ == '__main__':
         ARGS.print_help()
     else:
         loop = tulip.get_event_loop()
-        loop.set_log_level(logging.CRITICAL)
         if signal is not None:
             loop.add_signal_handler(signal.SIGINT, loop.stop)
 
diff --git a/examples/wsclient.py b/examples/wsclient.py
index 5598c38..f5b2ef5 100755
--- a/examples/wsclient.py
+++ b/examples/wsclient.py
@@ -92,7 +92,6 @@ if __name__ == '__main__':
     loop = tulip.SelectorEventLoop(tulip.selectors.SelectSelector())
     tulip.set_event_loop(loop)
 
-    loop.set_log_level(50)
     loop.add_signal_handler(signal.SIGINT, loop.stop)
     tulip.Task(start_client(loop, url))
     loop.run_forever()
diff --git a/examples/wssrv.py b/examples/wssrv.py
index 8459f45..2befec1 100755
--- a/examples/wssrv.py
+++ b/examples/wssrv.py
@@ -3,7 +3,6 @@
 
 import argparse
 import os
-import logging
 import socket
 import signal
 import time
@@ -120,7 +119,6 @@ class ChildProcess:
         # start server
         self.loop = loop = tulip.new_event_loop()
         tulip.set_event_loop(loop)
-        loop.set_log_level(logging.CRITICAL)
 
         def stop():
             self.loop.stop()
@@ -277,7 +275,6 @@ class Superviser:
 
     def __init__(self, args):
         self.loop = tulip.get_event_loop()
-        self.loop.set_log_level(logging.CRITICAL)
         self.args = args
         self.workers = []