From b76bfb56062aaf37160062a12a1517dc69123047 Mon Sep 17 00:00:00 2001
From: lilydjwg <lilydjwg@gmail.com>
Date: Thu, 13 Aug 2020 20:01:02 +0800
Subject: [PATCH] fixes

---
 README.rst              |  2 +-
 nvchecker/__main__.py   |  2 +-
 nvchecker/core.py       | 19 ++++++++++++-------
 nvchecker/util.py       | 13 +++++++++++--
 nvchecker_source/cmd.py | 17 +++++++++++------
 5 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/README.rst b/README.rst
index a441082..a1b3ae3 100644
--- a/README.rst
+++ b/README.rst
@@ -168,7 +168,7 @@ newver
 proxy
   The HTTP proxy to use. The format is ``proto://host:port``, e.g. ``http://localhost:8087``.
 
-max_concurrent
+max_concurrency
   Max number of concurrent jobs. Default: 20.
 
 keyfile
diff --git a/nvchecker/__main__.py b/nvchecker/__main__.py
index 2e065de..1a01056 100755
--- a/nvchecker/__main__.py
+++ b/nvchecker/__main__.py
@@ -34,7 +34,7 @@ def main() -> None:
     file = args.file
 
   entries, options = core.load_file(file)
-  token_q = core.token_queue(options.max_concurrent)
+  token_q = core.token_queue(options.max_concurrency)
   result_q: asyncio.Queue[RawResult] = asyncio.Queue()
   try:
     futures = core.dispatch(
diff --git a/nvchecker/core.py b/nvchecker/core.py
index 9ed8407..5dbf1bf 100644
--- a/nvchecker/core.py
+++ b/nvchecker/core.py
@@ -26,7 +26,7 @@ from .lib import nicelogger
 from . import slogconf
 from .util import (
   Entry, Entries, KeyManager, RawResult, Result, VersData,
-  FunctionWorker,
+  FunctionWorker, GetVersionError,
 )
 from . import __version__
 from .sortversion import sort_version_keys
@@ -128,7 +128,7 @@ def write_verfile(file: Path, versions: VersData) -> None:
 
 class Options(NamedTuple):
   ver_files: Optional[Tuple[Path, Path]]
-  max_concurrent: int
+  max_concurrency: int
   keymanager: KeyManager
 
 def load_file(
@@ -156,16 +156,16 @@ def load_file(
         os.path.expanduser(c.get('keyfile')))
       keyfile = d / keyfile_s
 
-    max_concurrent = c.getint(
-      'max_concurrent', 20)
+    max_concurrency = c.get(
+      'max_concurrency', 20)
     keymanager = KeyManager(keyfile)
 
   else:
-    max_concurrent = 20
+    max_concurrency = 20
     keymanager = KeyManager(None)
 
   return cast(Entries, config), Options(
-    ver_files, max_concurrent, keymanager)
+    ver_files, max_concurrency, keymanager)
 
 def token_queue(maxsize: int) -> Queue[bool]:
   token_q: Queue[bool] = Queue(maxsize=maxsize)
@@ -270,7 +270,12 @@ def _process_result(r: RawResult) -> Optional[Result]:
   conf = r.conf
   name = r.name
 
-  if isinstance(version, Exception):
+  if isinstance(version, GetVersionError):
+    kw = version.kwargs
+    kw['name'] = name
+    logger.error(version.msg, **kw)
+    return None
+  elif isinstance(version, Exception):
     logger.error('unexpected error happened',
                   name=r.name, exc_info=r.version)
     return None
diff --git a/nvchecker/util.py b/nvchecker/util.py
index a6904a7..9054f39 100644
--- a/nvchecker/util.py
+++ b/nvchecker/util.py
@@ -8,12 +8,14 @@ from asyncio import Queue
 import contextlib
 from typing import (
   Dict, Optional, List, AsyncGenerator, NamedTuple, Union,
-  Any, Tuple, Coroutine, Callable,
-  TYPE_CHECKING,
+  Any, Tuple, Callable, TYPE_CHECKING,
 )
 from pathlib import Path
 
 import toml
+import structlog
+
+logger = structlog.get_logger(logger_name=__name__)
 
 Entry = Dict[str, Any]
 Entries = Dict[str, Entry]
@@ -62,10 +64,12 @@ class BaseWorker:
   @contextlib.asynccontextmanager
   async def acquire_token(self) -> AsyncGenerator[None, None]:
     token = await self.token_q.get()
+    logger.debug('got token')
     try:
       yield
     finally:
       await self.token_q.put(token)
+      logger.debug('return token')
 
 if TYPE_CHECKING:
   from typing_extensions import Protocol
@@ -155,3 +159,8 @@ class FunctionWorker(BaseWorker):
       version = await fu
       self.cache[key] = version
       return version
+
+class GetVersionError(Exception):
+  def __init__(self, msg: str, **kwargs: Any) -> None:
+    self.msg = msg
+    self.kwargs = kwargs
diff --git a/nvchecker_source/cmd.py b/nvchecker_source/cmd.py
index 6242b1a..40f8531 100644
--- a/nvchecker_source/cmd.py
+++ b/nvchecker_source/cmd.py
@@ -5,6 +5,8 @@ import asyncio
 
 import structlog
 
+from nvchecker.util import GetVersionError
+
 logger = structlog.get_logger(logger_name=__name__)
 
 def cacher(name, conf):
@@ -12,6 +14,7 @@ def cacher(name, conf):
 
 async def get_version(name, conf, *, keymanager=None):
   cmd = conf['cmd']
+  logger.debug('running cmd', name=name, cmd=cmd)
   p = await asyncio.create_subprocess_shell(
     cmd,
     stdout=asyncio.subprocess.PIPE,
@@ -22,12 +25,14 @@ async def get_version(name, conf, *, keymanager=None):
   output = output.strip().decode('latin1')
   error = error.strip().decode(errors='replace')
   if p.returncode != 0:
-    logger.error('command exited with error',
-                 cmd=cmd, error=error,
-                 name=name, returncode=p.returncode)
+    raise GetVersionError(
+      'command exited with error',
+      cmd=cmd, error=error,
+      name=name, returncode=p.returncode)
   elif not output:
-    logger.error('command exited without output',
-                 cmd=cmd, error=error,
-                 name=name, returncode=p.returncode)
+    raise GetVersionError(
+      'command exited without output',
+      cmd=cmd, error=error,
+      name=name, returncode=p.returncode)
   else:
     return output