From f1314c7ec15a55104a4eaf30e66efa6b85a01f0e Mon Sep 17 00:00:00 2001
From: Joscha <brummer@migejolise.de>
Date: Tue, 28 Mar 2017 16:24:32 +0000
Subject: [PATCH] Add context handlers to Connection and use system ca_cert
 file

---
 yaboli/__init__.py   |  3 ++-
 yaboli/connection.py | 25 ++++++++++++++++++-------
 yaboli/messagedb.py  |  4 ++++
 3 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 yaboli/messagedb.py

diff --git a/yaboli/__init__.py b/yaboli/__init__.py
index 3a8bc8b..ee57d19 100644
--- a/yaboli/__init__.py
+++ b/yaboli/__init__.py
@@ -1,9 +1,10 @@
 import logging
 logging.basicConfig(
 	level=logging.DEBUG,
-	format="[{levelname}] in {threadName: <13} <{name}>: {message}",
+	format="[{levelname: <5}] in {threadName: <13} <{name}>: {message}",
 	style="{"
 )
 
 from .basic_types import Message, SessionView
 from .callbacks import Callbacks
+from .connection import Connection
diff --git a/yaboli/connection.py b/yaboli/connection.py
index f1ac44e..9a02beb 100644
--- a/yaboli/connection.py
+++ b/yaboli/connection.py
@@ -1,5 +1,6 @@
 import json
 import logging
+import ssl
 import time
 import threading
 import websocket
@@ -7,6 +8,7 @@ from websocket import WebSocketException as WSException
 
 from .callbacks import Callbacks
 
+SSLOPT_CA_CERTS = {'ca_certs': ssl.get_default_verify_paths().cafile}
 logger = logging.getLogger(__name__)
 
 class Connection():
@@ -33,15 +35,23 @@ class Connection():
 		
 		self.room = room
 		
-		self._url_format = url_format or ROOM_FORMAT
+		self._url_format = url_format or Connection.ROOM_FORMAT
 		
 		self._stopping = False
 		
 		self._ws = None
 		self._thread = None
 		self._send_id = 0
-		self._callbacks = callbacks.Callbacks()
-		self._id_callbacks = callbacks.Callbacks()
+		self._callbacks = Callbacks()
+		self._id_callbacks = Callbacks()
+		self._lock = threading.Lock()
+	
+	def __enter__(self):
+		self._lock.acquire()
+		return self
+	
+	def __exit__(self, exc_type, exc_value, traceback):
+		self._lock.release()
 	
 	def _connect(self, tries=-1, delay=10):
 		"""
@@ -59,21 +69,22 @@ class Connection():
 		while tries != 0:
 			try:
 				url = self._url_format.format(self.room)
-				logger.log("Connecting to url: {!r}".format(url))
+				logger.info("Connecting to url: {!r}".format(url))
 				logger.debug("{} {} left".format(
 					tries-1 if tries>0 else "infinite",
-					"tries" if tries!=1 else "try" # proper english :D
+					"tries" if (tries-1)!=1 else "try" # proper english :D
 				))
 				self._ws = websocket.create_connection(
 					url,
-					enable_multithread=True
+					enable_multithread=True,
+					sslopt=SSLOPT_CA_CERTS
 				)
 			
 			except WSException:
 				if tries > 0:
 					tries -= 1
 				if tries != 0:
-					logger.log("Connection failed. Retrying in {} seconds.".format(delay))
+					logger.info("Connection failed. Retrying in {} seconds.".format(delay))
 					time.sleep(delay)
 			
 			else:
diff --git a/yaboli/messagedb.py b/yaboli/messagedb.py
new file mode 100644
index 0000000..77c1a50
--- /dev/null
+++ b/yaboli/messagedb.py
@@ -0,0 +1,4 @@
+import sqlite3
+
+class MessageDB():
+	pass