From 846458373ba89433a854a748ae4597158b84edcb Mon Sep 17 00:00:00 2001
From: tonyrewin <anton.rewin@gmail.com>
Date: Sun, 27 Nov 2022 23:07:24 +0300
Subject: [PATCH] try-fix-cors

---
 nginx.conf.sigil        | 41 ++++++++++++-----------------------------
 services/stat/viewed.py |  2 --
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/nginx.conf.sigil b/nginx.conf.sigil
index 8de054e7..6a840de9 100644
--- a/nginx.conf.sigil
+++ b/nginx.conf.sigil
@@ -114,37 +114,20 @@ server {
     {{ if $.PROXY_X_FORWARDED_SSL }}proxy_set_header X-Forwarded-Ssl {{ $.PROXY_X_FORWARDED_SSL }};{{ end }}
 
     if ($request_method = 'OPTIONS') {
-        add_header 'Access-Control-Allow-Origin' '$allow_origin' always;
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-        #
-        # Custom headers and headers various browsers *should* be OK with but aren't
-        #
-        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization';
-        add_header 'Access-Control-Allow-Credentials' 'true';
-        #
-        # Tell client that this pre-flight info is valid for 20 days
-        #
-        add_header 'Access-Control-Max-Age' 1728000;
-        add_header 'Content-Type' 'text/plain; charset=utf-8';
-        add_header 'Content-Length' 0;
+        add_header Access-Control-Allow-Origin $allow_origin always;
+        add_header Access-Control-Allow-Methods 'GET, PATCH, POST, OPTIONS';
+        add_header Access-Control-Allow-Headers 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization' always;
+        add_header Access-Control-Allow-Credentials 'true';
+        add_header Access-Control-Max-Age 1728000;
+        add_header Content-Type 'text/plain; charset=utf-8';
+        add_header Content-Length' 0;
         return 204;
      }
-
-     if ($request_method = 'POST') {
-        add_header 'Access-Control-Allow-Origin' '$allow_origin' always;
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
-        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization' always;
-        add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
-        add_header 'Access-Control-Allow-Credentials' 'true' always;
-     }
-
-     if ($request_method = 'GET') {
-        add_header 'Access-Control-Allow-Origin' '$allow_origin' always;
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
-        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization' always;
-        add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
-        add_header 'Access-Control-Allow-Credentials' 'true' always;
-     }
+      add_header Access-Control-Allow-Origin $allow_origin always;
+      add_header Access-Control-Allow-Methods 'GET, PATCH, POST, OPTIONS' always;
+        add_header Access-Control-Allow-Headers 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization' always;
+      add_header Access-Control-Expose-Headers 'Content-Length,Content-Range' always;
+      add_header Access-Control-Allow-Credentials 'true' always;
   }
 
   {{ if $.CLIENT_MAX_BODY_SIZE }}client_max_body_size {{ $.CLIENT_MAX_BODY_SIZE }};{{ end }}
diff --git a/services/stat/viewed.py b/services/stat/viewed.py
index e8e24340..85894ad2 100644
--- a/services/stat/viewed.py
+++ b/services/stat/viewed.py
@@ -179,10 +179,8 @@ class ViewedStorage:
         async with self.lock:
             while True:
                 try:
-                    ts = time.time()
                     await self.update_pages()
                     failed = 0
-                    print("[stat.viewed] update_pages took %fs " % (time.time() - ts))
                 except Exception:
                     failed += 1
                     print("[stat.viewed] update failed #%d, wait 10 seconds" % failed)