Merge pull request #5 from lost-rob0t/fix-settings

fix(settings): use constants and seperate defvars

Author: lost-rob0t

source/gserver-settings.lisp

@@ -1,45 +1,62 @@
 (in-package :star)
-;;;  Version info
-(defparameter *star-server-version* "0.0.1")
-;;;; ** Gserver Settings
-;;;; *** Couchdb
-(defparameter *couchdb-host* (or (uiop:getenv "COUCHDB_HOST") "127.0.0.1") "The Couchdb host to use.
-Defaults to using ENV var $COUCHDB_HOST if set, or localhost ")
-(defparameter *couchdb-port* 5984 "The Couchdb port to use. Defaults to 5984")
-(defparameter *couchdb-default-database* (or (uiop:getenv "COUCHDB_DATABASE") "starintel") "the default database name to use.")
 
-(defparameter *couchdb-auth-database* "starintel-gserver-auth")
-(defparameter *couchdb-scheme* "http" "what http scheme to use. set to http or https")
-(defparameter *couchdb-user* (or (uiop:getenv "COUCHDB_USER") "admin") "couchdb user")
-(defparameter *couchdb-password* (or (uiop:getenv "COUCHDB_PASSWORD") "password") "couchdb user password")
-;;;; By Default the views in starintel-gserver/views will be installed, but you can append your own to this setting to have it created at startup.
-(defparameter *couchdb-views* (let ((files (uiop:directory-files (uiop:merge-pathnames* "views/" (asdf:system-source-directory :starintel-gserver)))))
-                                (loop for file in files
-                                      collect (with-open-file (str file)
-                                                (read-line str))))
-  "List of views to install into couchdb.")
+(defparameter +default-couchdb-host+ "127.0.0.1")
+(defparameter +default-couchdb-port+ 5984)
+(defparameter +default-couchdb-default-database+ "starintel")
+(defparameter +default-couchdb-user+ "admin")
+(defparameter +default-couchdb-password+ "password")
+(defparameter +default-http-api-address+ "localhost")
+(defparameter +default-rabbit-address+ "localhost")
+(defparameter +default-rabbit-port+ 5672)
+(defparameter +default-rabbit-user+ "guest")
+(defparameter +default-rabbit-password+ "guest")
+(defparameter +default-slynk-port+ 4009)
 
-;;;; *** HTTP API
-(defparameter *http-api-address* (or (uiop:getenv "HTTP_API_LISTEN_ADDRESS") "localhost") "the listen address")
-(defparameter *http-api-port* 5000  "the port the api server listen on")
-(defparameter *http-api-base-path* "/api" "the base url to use for the api endpoint")
-(defparameter *http-cert-file* nil "path to the http api cert providing https")
-(defparameter *http-key-file* nil "path to the http cert providing https")
-(defparameter *http-scheme* 'http "use https or not.")
+(defparameter *couchdb-host* +default-couchdb-host+
+  "The Couchdb host to use. Uses ENV var COUCHDB_HOST if set.")
+(defparameter *couchdb-port* +default-couchdb-port+
+  "The Couchdb port to use. Defaults to 5984.")
+(defparameter *couchdb-default-database* +default-couchdb-default-database+
+  "The default database name to use.")
+(defparameter *couchdb-user* +default-couchdb-user+
+  "Couchdb user name.")
+(defparameter *couchdb-password* +default-couchdb-password+
+  "Couchdb user password.")
 
-;;;; *** RabbitMQ
-(defparameter *rabbit-address* (or (uiop:getenv "RABBITMQ_ADDRESS") "localhost") "The address rabbitmq is running on.")
-(defparameter *rabbit-port* 5672 "The port that rabbitmq is listening on.")
-(defparameter *rabbit-user* "guest" "the username for rabbimq")
-(defparameter *rabbit-password* "guest" "the password for the rabbitmq user.")
-(defparameter *slynk-port* 4009 "Port to use for SLYNK remote debugging")
+(defparameter *couchdb-views*
+  (when (asdf:system-source-directory :starintel-gserver)
+    (let* ((views-dir (uiop::merge-pathnames* "views/" (asdf:system-source-directory :starintel-gserver))))
+      (when (probe-file views-dir)
+        (loop for file in (uiop:directory-files views-dir)
+              collect (with-open-file (str (uiop:merge-pathnames* file views-dir))
+                        (read-line str))))))
+  "List of views to install into Couchdb.")
 
-;;;; *** Actors
-;;;; Hooks are implemented Via nhooks you can read documentation here for how to add hooks. https://github.com/atlas-engineer/nhooks
-(defparameter *actors-start-hook* (make-instance 'nhooks:hook-void) "Actor startup hook.")
-;;;; *** Patterns
-;;;; Patterns are
-(defparameter *document-patterns* () "A List of document patterns created by defpattern")
-(defparameter *injest-workers* 4 "Number of workers for handling documents, set to 4 by default.")
-;;;; *** actor event log
-(defparameter *couchdb-event-log-database* "starintel-event-source" "The name of the database to be used for event logs.")
+;; HTTP API configuration
+(defparameter *http-api-address* +default-http-api-address+
+  "The address on which the HTTP API listens.")
+(defparameter *http-api-port* 5000  "Port for the HTTP API.")
+(defparameter *http-api-base-path* "/api" "Base URL for the API endpoint.")
+(defparameter *http-cert-file* nil "Path to the HTTPS cert file.")
+(defparameter *http-key-file* nil "Path to the HTTPS key file.")
+(defparameter *http-scheme* 'http "HTTP scheme to use (http or https).")
+
+;; RabbitMQ configuration
+(defparameter *rabbit-address* +default-rabbit-address+
+  "The RabbitMQ host.")
+(defparameter *rabbit-port* +default-rabbit-port+
+  "The port for RabbitMQ.")
+(defparameter *rabbit-user* +default-rabbit-user+
+  "The RabbitMQ user name.")
+(defparameter *rabbit-password* +default-rabbit-password+
+  "The RabbitMQ user password.")
+
+;; Other configurations
+(defparameter *slynk-port* +default-slynk-port+
+  "Port to use for SLYNK remote debugging.")
+(defparameter *actors-start-hook* (make-instance 'nhooks:hook-void)
+  "Actor startup hook.")
+(defparameter *document-patterns* () "A list of document patterns created by defpattern.")
+(defparameter *injest-workers* 4 "Number of workers for handling documents.")
+(defparameter *couchdb-event-log-database* "starintel-event-source"
+  "The database name used for event logs.")