fix proxy

Author: PrinsINT

proxy/nginx.conf

@@ -1,31 +1,35 @@
-server {
-    listen   80;
-    listen   [::]:80 default ipv6only=on;
+events {}
 
-    root /usr/share/nginx/html;
-    index index.html;
+http {
+    server {
+        listen   80;
+        listen   [::]:80 default ipv6only=on;
 
-    # timeouts
-    proxy_send_timeout 3600;
-    proxy_read_timeout 3600;
-    fastcgi_send_timeout 3600;
-    fastcgi_read_timeout 3600;
+        root /usr/share/nginx/html;
+        index index.html;
 
-    # file size
-    client_max_body_size 150M;
+        # timeouts
+        proxy_send_timeout 3600;
+        proxy_read_timeout 3600;
+        fastcgi_send_timeout 3600;
+        fastcgi_read_timeout 3600;
 
-    # all hostnames
-    server_name _;
+        # file size
+        client_max_body_size 150M;
 
-    # Reverse proxies for the backend
-    location /galahad/api/ {
-        proxy_pass http://server:8010/;
-        proxy_set_header X-Forwarded-Host localhost;
-        proxy_set_header X-Forwarded-Proto http;
-    }
+        # all hostnames
+        server_name _;
+
+        # Reverse proxies for the backend
+        location /galahad/api/ {
+            proxy_pass http://server:8010/;
+            proxy_set_header X-Forwarded-Host localhost;
+            proxy_set_header X-Forwarded-Proto http;
+        }
 
-    # Reverse proxy for the frontend
-    location / {
-        proxy_pass http://client:8080/;
+        # Reverse proxy for the frontend
+        location / {
+            proxy_pass http://client:8080/;
+        }
     }
 }

server/src/main/kotlin/org/ivdnt/galahad/formats/folia/AaltoFoliaReader.kt

@@ -5,21 +5,21 @@ import org.ivdnt.galahad.annotations.Annotation
 import org.ivdnt.galahad.annotations.AnnotationReader
 import org.ivdnt.galahad.annotations.Layer
 import org.ivdnt.galahad.annotations.Term
+import org.ivdnt.galahad.util.XmlUtil
 import java.io.File
 import javax.xml.stream.XMLInputFactory
 import javax.xml.stream.XMLStreamConstants
 import javax.xml.stream.XMLStreamReader
 
 class AaltoFoliaReader(file: File,
 ) : AnnotationReader(file)  {
-    private val factory: XMLInputFactory = InputFactoryImpl()
     private var pos: String = ""
     private var lemma: String = ""
     private var literal: String = ""
     private var ignoring: Boolean = false
 
     override fun read(): Layer {
-        val reader = factory.createXMLStreamReader(file.inputStream())
+        val reader = XmlUtil.inputFactory.createXMLStreamReader(file.inputStream())
         parseTopLevelTextNodes(reader)
         return Layer(documents)
     }

server/src/main/kotlin/org/ivdnt/galahad/util/XmlUtil.kt

@@ -1,5 +1,6 @@
 package org.ivdnt.galahad.util
 
+import com.fasterxml.aalto.stax.InputFactoryImpl
 import org.w3c.dom.Document
 import org.w3c.dom.Element
 import org.w3c.dom.Node
@@ -83,7 +84,6 @@ abstract class XmlUtil(
                 setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, "yes")
             }
         }
-
-        val inputFactory: XMLInputFactory by lazy { XMLInputFactory.newInstance() }
+        val inputFactory: XMLInputFactory by lazy { InputFactoryImpl() }
     }
 }