added redis to config.yaml

Author: sacca97

prospector/api/routers/jobs.py

@@ -8,8 +8,12 @@
 from api.routers.nvd_feed_update import main
 from git.git import do_clone
 from log.logger import logger
+from util.config_parser import parse_config_file
 
-redis_url = os.environ["REDIS_URL"]
+config = parse_config_file()
+
+
+redis_url = config.redis_url
 
 router = APIRouter(
     prefix="/jobs",

prospector/commitdb/postgres.py

@@ -28,13 +28,31 @@ class PostgresCommitDB(CommitDB):
     """
 
     def __init__(self, user, password, host, port, dbname):
-        self.connect_string = "postgresql://{}:{}@{}:{}/{}".format(
-            user, password, host, port, dbname
-        ).lower()
+        self.user = user
+        self.password = password
+        self.host = host
+        self.port = port
+        self.dbname = dbname
         self.connection = None
 
     def connect(self):
-        self.connection = psycopg2.connect(self.connect_string)
+        try:
+            self.connection = psycopg2.connect(
+                database=self.dbname,
+                user=self.user,
+                password=self.password,
+                host=self.host,
+                port=self.port,
+            )
+        except Exception:
+            self.host = "localhost"
+            self.connection = psycopg2.connect(
+                database=self.dbname,
+                user=self.user,
+                password=self.password,
+                host=self.host,
+                port=self.port,
+            )
 
     def lookup(self, repository: str, commit_id: str = None) -> List[Dict[str, Any]]:
         if not self.connection:

prospector/config-sample.yaml

@@ -27,6 +27,8 @@ database:
   port: 5432
   dbname: postgres
 
+redis_url: redis://localhost:6379/0
+
 # Report file format: "html", "json", "console" or "all"
 # and the file name
 report: