Merge ~pappacena/turnip:fix-fd-leak into turnip:master

[Thiago F. Pappacena]

Explicitly closing config file descriptor when reading configuration.

This causes "ResourceWarning: unclosed file" messages on python3 (but it's a silent problem on python 2). Since we have a bug about too many open file descriptors, this might help to fix that. See https://bugs.launchpad.net/turnip/+bug/1683546 .

[Colin Watson (cjwatson)]

review: Approve

569dcdd... by Thiago F. Pappacena on 2020-02-21

Using safe_load to read config.yml

5bf5124... by Thiago F. Pappacena on 2020-02-21

making TurnipConfig a singleton

[Thiago F. Pappacena (pappacena)]

cjwatson, making TurnipConfig a singleton.

b931681... by Thiago F. Pappacena on 2020-02-21

replacing TurnipConfig usages by it's singleton

[Colin Watson (cjwatson)]

review: Approve

diff --git a/httpserver.tac b/httpserver.tac
index 8530c1a..cf1d876 100644
--- a/httpserver.tac
+++ b/httpserver.tac
@@ -12,7 +12,7 @@ from twisted.application import (
 from twisted.scripts.twistd import ServerOptions
 from twisted.web import server
 
-from turnip.config import TurnipConfig
+from turnip.config import config
 from turnip.log import RotatableFileLogObserver
 from turnip.pack.http import SmartHTTPFrontendResource
 
@@ -20,7 +20,6 @@ from turnip.pack.http import SmartHTTPFrontendResource
 def getSmartHTTPService():
     """Return a SmartHTTP frontend service."""
 
-    config = TurnipConfig()
     smarthttp_site = server.Site(SmartHTTPFrontendResource(config))
     return internet.TCPServer(
         int(config.get('smart_http_port')), smarthttp_site)
diff --git a/packbackendserver.tac b/packbackendserver.tac
index 10602eb..191ac16 100644
--- a/packbackendserver.tac
+++ b/packbackendserver.tac
@@ -18,7 +18,7 @@ from twisted.application import (
     )
 from twisted.scripts.twistd import ServerOptions
 
-from turnip.config import TurnipConfig
+from turnip.config import config
 from turnip.log import RotatableFileLogObserver
 from turnip.pack.git import PackBackendFactory
 from turnip.pack.hookrpc import (
@@ -30,7 +30,6 @@ from turnip.pack.hookrpc import (
 def getPackBackendServices():
     """Return PackBackendFactory and HookRPC services."""
 
-    config = TurnipConfig()
     repo_store = config.get('repo_store')
     pack_backend_port = int(config.get('pack_backend_port'))
     hookrpc_handler = HookRPCHandler(
diff --git a/packfrontendserver.tac b/packfrontendserver.tac
index 20cbb57..1070914 100644
--- a/packfrontendserver.tac
+++ b/packfrontendserver.tac
@@ -16,7 +16,7 @@ from twisted.application import (
     )
 from twisted.scripts.twistd import ServerOptions
 
-from turnip.config import TurnipConfig
+from turnip.config import config
 from turnip.log import RotatableFileLogObserver
 from turnip.pack.git import PackFrontendFactory
 
@@ -24,7 +24,6 @@ from turnip.pack.git import PackFrontendFactory
 def getPackFrontendService():
     """Return a PackFrontend Service."""
 
-    config = TurnipConfig()
     return internet.TCPServer(
         int(config.get('pack_frontend_port')),
         PackFrontendFactory(config.get('pack_virt_host'),
diff --git a/sshserver.tac b/sshserver.tac
index 037e60a..aaf8220 100644
--- a/sshserver.tac
+++ b/sshserver.tac
@@ -15,14 +15,13 @@ import os
 from twisted.application import service
 from twisted.scripts.twistd import ServerOptions
 
-from turnip.config import TurnipConfig
+from turnip.config import config
 from turnip.log import RotatableFileLogObserver
 from turnip.pack.ssh import SmartSSHService
 
 
 def getSmartSSHService():
 
-    config = TurnipConfig()
     log_path = config.get('turnip_log_dir')
 
     return SmartSSHService(
diff --git a/turnip/api/views.py b/turnip/api/views.py
index 79ff8d5..adede04 100644
--- a/turnip/api/views.py
+++ b/turnip/api/views.py
@@ -10,7 +10,7 @@ from cornice.util import extract_json_data
 from pygit2 import GitError
 import pyramid.httpexceptions as exc
 
-from turnip.config import TurnipConfig
+from turnip.config import config
 from turnip.api import store
 
 
@@ -36,7 +36,6 @@ def validate_path(func):
 
 class BaseAPI(object):
     def __init__(self):
-        config = TurnipConfig()
         self.repo_store = config.get('repo_store')
 
 
diff --git a/turnip/config.py b/turnip/config.py
index 2db61bc..f57b790 100644
--- a/turnip/config.py
+++ b/turnip/config.py
@@ -7,15 +7,23 @@ import os
 
 import yaml
 
+__all__ = [
+    'config',
+    ]
+
 
 class TurnipConfig(object):
     """Return configuration from environment or defaults."""
 
     def __init__(self):
         """Load default configuration from config.yaml"""
-        config_file = open(os.path.join(
-            os.path.dirname(os.path.dirname(__file__)), 'config.yaml'))
-        self.defaults = yaml.load(config_file)
+        config_file_path = os.path.join(
+            os.path.dirname(os.path.dirname(__file__)), 'config.yaml')
+        with open(config_file_path) as config_file:
+            self.defaults = yaml.safe_load(config_file)
 
     def get(self, key):
         return os.getenv(key.upper()) or self.defaults.get(key.lower()) or ''
+
+
+config = TurnipConfig()
diff --git a/turnipserver.py b/turnipserver.py
index 65967c3..8627392 100644
--- a/turnipserver.py
+++ b/turnipserver.py
@@ -12,7 +12,7 @@ import os
 from twisted.internet import reactor
 from twisted.web import server
 
-from turnip.config import TurnipConfig
+from turnip.config import config
 from turnip.pack.git import (
     PackBackendFactory,
     PackFrontendFactory,
@@ -27,7 +27,6 @@ from turnip.pack.ssh import SmartSSHService
 
 data_dir = os.path.join(
     os.path.dirname(__file__), "turnip", "pack", "tests", "data")
-config = TurnipConfig()
 
 LOG_PATH = config.get('turnip_log_dir')
 PACK_VIRT_HOST = config.get('pack_virt_host')
diff --git a/virtserver.tac b/virtserver.tac
index a25d1e5..e6654cd 100644
--- a/virtserver.tac
+++ b/virtserver.tac
@@ -13,7 +13,7 @@ from twisted.application import (
     )
 from twisted.scripts.twistd import ServerOptions
 
-from turnip.config import TurnipConfig
+from turnip.config import config
 from turnip.log import RotatableFileLogObserver
 from turnip.pack.git import PackVirtFactory
 
@@ -21,7 +21,6 @@ from turnip.pack.git import PackVirtFactory
 def getPackVirtService():
     """Return a PackVirt Service."""
 
-    config = TurnipConfig()
     return internet.TCPServer(
         int(config.get('pack_virt_port')),
         PackVirtFactory(config.get('pack_backend_host'),