From b1ee80edee5d948cc476ec9d3b55b37bb8bb8f86 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 28 Sep 2023 19:08:34 +0800 Subject: [PATCH] fix themoivedb timeout --- README.md | 1 + app/modules/themoviedb/tmdbv3api/tmdb.py | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fe181684..bf1e145e 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ docker pull jxxghp/moviepilot:latest - **PGID**:运行程序用户的`gid`,默认`0` - **UMASK**:掩码权限,默认`000`,可以考虑设置为`022` - **MOVIEPILOT_AUTO_UPDATE**:重启更新,`true`/`false`,默认`true` **注意:如果出现网络问题可以配置`PROXY_HOST`,具体看下方`PROXY_HOST`解释** +- **MOVIEPILOT_AUTO_UPDATE_DEV**:重启时更新到未发布的开发版本代码,`true`/`false`,默认`false` - **NGINX_PORT:** WEB服务端口,默认`3000`,可自行修改,不能与API服务端口冲突 - **PORT:** API服务端口,默认`3001`,可自行修改,不能与WEB服务端口冲突 - **SUPERUSER:** 超级管理员用户名,默认`admin`,安装后使用该用户登录后台管理界面 diff --git a/app/modules/themoviedb/tmdbv3api/tmdb.py b/app/modules/themoviedb/tmdbv3api/tmdb.py index dbe66000..e4b9bd81 100644 --- a/app/modules/themoviedb/tmdbv3api/tmdb.py +++ b/app/modules/themoviedb/tmdbv3api/tmdb.py @@ -30,6 +30,7 @@ class TMDb(object): self.__class__._session = requests.Session() if session is None else session self._remaining = 40 self._reset = None + self._timeout = 15 self.obj_cached = obj_cached if os.environ.get(self.TMDB_LANGUAGE) is None: os.environ[self.TMDB_LANGUAGE] = "en-US" @@ -131,12 +132,14 @@ class TMDb(object): @lru_cache(maxsize=REQUEST_CACHE_MAXSIZE) def cached_request(self, method, url, data, json): - return requests.request(method, url, data=data, json=json, proxies=self.proxies) + return requests.request(method, url, data=data, json=json, + timeout=self._timeout, proxies=self.proxies) def cache_clear(self): return self.cached_request.cache_clear() - def _request_obj(self, action, params="", call_cached=True, method="GET", data=None, json=None, key=None): + def _request_obj(self, action, params="", call_cached=True, + method="GET", data=None, json=None, key=None): if self.api_key is None or self.api_key == "": raise TMDbException("No API key found.") @@ -151,7 +154,8 @@ class TMDb(object): if self.cache and self.obj_cached and call_cached and method != "POST": req = self.cached_request(method, url, data, json) else: - req = self.__class__._session.request(method, url, data=data, json=json, proxies=self.proxies) + req = self.__class__._session.request(method, url, data=data, json=json, + timeout=self._timeout, proxies=self.proxies) headers = req.headers