+ custom refresh after setup

Author: bRuttaZz

README.md

@@ -36,6 +36,7 @@ curl http://localhost:8000/api/v1/apod.json -s | jq
 - `SERVICE_BASE_URL` (defaults to empty string, eg: `http://localhost:8000` )
 - `APOD_PAGE_MAX_SIZE` (defaults to 50kb) -- to save your server
 - `APOD_IMG_MAX_SIZE` (defaults to 10Mb) -- to save your server
+- `REFRESH_AFTER_HR` (defaults to 2) -- period to refresh the cache
 
 ### Pre-built docker images:
 - `bruttazz/apod-api`

nginx.conf

@@ -43,22 +43,17 @@ http {
                 if res.status == 200 then
                     info = cjson.decode(res.body)
 
-                    local year, month, day = info.date:match("^(%d+)%-(%d+)%-(%d+)$")
+                    local year, month, day, hr, min, sec = info.date:match("^(%d+)%-(%d+)%-(%d+)%-(%d+)%-(%d+)%-(%d+)$")
                     local time = os.time({
                         year = tonumber(year),
                         month = tonumber(month),
                         day = tonumber(day),
-                        hour = 0,
-                        min = 0,
-                        sec = 0
+                        hour = tonumber(hr),
+                        min = tonumber(min),
+                        sec = tonumber(sec),
                     })
 
-                    local today = os.date("!*t")
-                    today.hour = 0
-                    today.min = 0
-                    today.sec = 0
-
-                    if time < os.time(today) then
+                    if os.time(os.date("!*t")) - time > settings.REFRESH_AFTER_S then
                         info = apod.extract()
                         if not info then
                             ngx.status = 500
@@ -74,6 +69,7 @@ http {
                         ngx.exit(500)
                     end
                 end
+                info.date = os.date("%Y-%m-%d")
                 ngx.say(cjson.encode(info))
             }
         }

src/apod.lua

@@ -190,7 +190,7 @@ function _apod_info_generator.extract()
 
     -- write info
     info.img = settings.SERVICE_BASE_URL .. settings.API_PREFIX .. img_name
-    info.date = os.date("%Y-%m-%d")
+    info.date = os.date("%Y-%m-%d-%H-%M-%S")
     info.source = settings.APOD_PAGE_URL
     info.credits = settings.APOD_HOST
 

src/settings.lua

@@ -2,14 +2,16 @@ local _settings = {
     APOD_PAGE_URL = os.getenv("APOD_PAGE_URL") or "http://www.star.ucl.ac.uk/~apod/apod/",
     SERVICE_BASE_URL = os.getenv("SERVICE_BASE_URL") or "",                   -- without trailing slash
 
-    APOD_PAGE_MAX_SIZE = tonumber(os.getenv("APOD_PAGE_MAX_SIZE") or 50000),  -- average ~4397
-    APOD_IMG_MAX_SIZE = tonumber(os.getenv("APOD_IMG_MAX_SIZE") or 10000000), -- average ~362026
+    APOD_PAGE_MAX_SIZE = tonumber(os.getenv("APOD_PAGE_MAX_SIZE")) or 50000,  -- average ~4397
+    APOD_IMG_MAX_SIZE = tonumber(os.getenv("APOD_IMG_MAX_SIZE")) or 10000000, -- average ~362026
 
     WWW_DIR = os.getenv("WWW_DIR") or ".",                                    -- without trailing slash
-    API_PREFIX = "/api/v1/"
+    API_PREFIX = "/api/v1/",
+
+    REFRESH_AFTER_HR = tonumber(os.getenv("REFRESH_AFTER_HR")) or 2,
 }
 _settings.APOD_HOST = _settings.APOD_PAGE_URL:match("^%w+://([^/]+)")
--- _settings.APOD_INFO_FILE = _settings.WWW_DIR .. "../",
+_settings.REFRESH_AFTER_S = _settings.REFRESH_AFTER_HR * 60 * 60
 
 if os.getenv("LOCAL_ENV") then
     package.path = "./deps/lua-htmlparser/src/?.lua;" .. package.path