From c6fdd1c3999af2d024848045231f112483173c39 Mon Sep 17 00:00:00 2001
From: "root (fetsite6)" <admin@fet.at>
Date: Mon, 19 Oct 2020 20:44:40 +0200
Subject: [PATCH] fixed etherpad link

---
 docker-compose.yml       | 12 ++++++++----
 fet2020/documents/api.py | 11 ++++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ddbc79fe..584013c5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,7 +20,7 @@ services:
   etherpadsql:
     image: jbergstroem/mariadb-alpine
     environment:
-      SKIP_INNODB: "yes"
+      SKIP_INNODB: "no"
       MYSQL_DATABASE: etherpaddb
       MYSQL_USER: user
       MYSQL_PASSWORD: hgu
@@ -37,14 +37,18 @@ services:
       DB_NAME: etherpaddb
       DB_USER: user
       DB_PASS: hgu
+      DB_CHARSET: utf8
+      #ADMIN_PASSWORD: "AndiS"
+      #REQUIRE_AUTHENTICATION: "false"
       TRUST_PROXY: "true"
-      REQUIRE_SESSION: "true"      
+      REQUIRE_SESSION: "true"
+      #LOGLEVEL: "DEBUG"     
     depends_on:
       - etherpadsql
     ports:
      - "9001:9001"
     volumes:
-     - ./APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
+     - ./etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
   fet2020:
     image: fet2020django
     build: .
@@ -62,7 +66,7 @@ services:
     volumes:
       - ./fet2020:/app
       - ./assets:/app/assets
-      - ./APIKEY.txt:/srv/etherpad/APIKEY.txt
+      - ./etherpad:/app/etherpad
 volumes:
   ep-mysql-volume:
   mysql-volume:
diff --git a/fet2020/documents/api.py b/fet2020/documents/api.py
index 4555c58b..54d368bf 100644
--- a/fet2020/documents/api.py
+++ b/fet2020/documents/api.py
@@ -18,6 +18,8 @@ def get_ep_client():
     try:
         with open(os.path.abspath(settings.ETHERPAD_CLIENT["apikey"]), "r") as f:
             apikey = f.read()
+            apikey = apikey.rstrip()
+            #logger.info(apikey)
             epc = EtherpadLiteClient(
                 base_params={'apikey': apikey, },
                 base_url=urllib.parse.urljoin(settings.ETHERPAD_CLIENT["url"], "api"),
@@ -26,7 +28,8 @@ def get_ep_client():
         group = epc.createGroupIfNotExistsFor(groupMapper="fet")
     except Exception as e:
         logger.info("Can't get connection to Etherpad Server. Error: {}".format(e))
-        return None, None
+        raise e
+        return None,None
 
     return epc, group
 
@@ -54,17 +57,23 @@ def __checkPadExists(padID=None):
 def createPadifNotExists(padID):
     epc, group = get_ep_client()
     if not epc:
+        logger.info("meh, not EPC")
         return None
 
     # Pad doesn't exist
     if not __checkPadExists(padID=padID):
         try:
+            logger.info("trying creategrouppad")
             epc.createGroupPad(groupID=group["groupID"], padName=padID, text="helloworld")
         except EtherpadException as e:
             # TODO: change it after Etherpad server is a better one than that because of http 500
+            logger.info("print e")
             print(e)
+            return None
         except Exception as e:
+            logger.info("raise e")
             raise e
+    logger.info(padID)
     return padID