Merge pull request #4 from michieldwitte/master

removed forced logging, set receiver thread as daemon, Let the outbound payload be binary

coapthon/client/coap.py

@@ -14,18 +14,13 @@ from coapthon.messages.message import Message
 from coapthon.messages.request import Request
 from coapthon.messages.response import Response
 from coapthon.serializer import Serializer
-from coapthon.utils import create_logging
 import collections
 
 
 __author__ = 'Giacomo Tanganelli'
 
 
-if not os.path.isfile("logging.conf"):
-    create_logging()
-
 logger = logging.getLogger(__name__)
-logging.config.fileConfig("logging.conf", disable_existing_loggers=False)
 
 
 class CoAP(object):
@@ -174,6 +169,7 @@ class CoAP(object):
 
         if self._receiver_thread is None or not self._receiver_thread.isAlive():
             self._receiver_thread = threading.Thread(target=self.receive_datagram)
+            self._receiver_thread.daemon = True
             self._receiver_thread.start()
 
     def _start_retransmission(self, transaction, message):

coapthon/forward_proxy/coap.py

@@ -17,15 +17,12 @@ from coapthon.messages.message import Message
 from coapthon.messages.request import Request
 from coapthon.resources.resource import Resource
 from coapthon.serializer import Serializer
-from coapthon.utils import Tree, create_logging
+from coapthon.utils import Tree
 
 __author__ = 'Giacomo Tanganelli'
 
-if not os.path.isfile("logging.conf"):
-    create_logging()
 
 logger = logging.getLogger(__name__)
-logging.config.fileConfig("logging.conf", disable_existing_loggers=False)
 
 
 class CoAP(object):

coapthon/reverse_proxy/coap.py

@@ -21,16 +21,12 @@ from coapthon.messages.request import Request
 from coapthon.resources.remoteResource import RemoteResource
 from coapthon.resources.resource import Resource
 from coapthon.serializer import Serializer
-from coapthon.utils import Tree, create_logging
+from coapthon.utils import Tree
 
 __author__ = 'Giacomo Tanganelli'
 
 
-if not os.path.isfile("logging.conf"):
-    create_logging()
-
 logger = logging.getLogger(__name__)
-logging.config.fileConfig("logging.conf", disable_existing_loggers=False)
 
 
 class CoAP(object):

coapthon/serializer.py

@@ -219,6 +219,10 @@ class Serializer(object):
             fmt += "B"
             values.append(defines.PAYLOAD_MARKER)
 
+            if isinstance(payload, bytes):
+                fmt += str(len(payload)) + "s"
+                values.append(payload)
+            else:
                 fmt += str(len(bytes(payload, "utf-8"))) + "s"
                 values.append(bytes(payload, "utf-8"))
             # for b in str(payload):

coapthon/server/coap.py

@@ -17,18 +17,13 @@ from coapthon.messages.response import Response
 from coapthon.resources.resource import Resource
 from coapthon.serializer import Serializer
 from coapthon.utils import Tree
-from coapthon.utils import create_logging
 import collections
 
 
 __author__ = 'Giacomo Tanganelli'
 
 
-if not os.path.isfile("logging.conf"):
-    create_logging()
-
 logger = logging.getLogger(__name__)
-logging.config.fileConfig("logging.conf", disable_existing_loggers=False)
 
 
 class CoAP(object):