From 6b216e2b7c4b8f4a54551ab3f01c2d2695a99d5b Mon Sep 17 00:00:00 2001 From: Uko Kokņevičs Date: Sat, 18 Oct 2025 05:36:44 +0300 Subject: Revert "Added a SWANK server" This reverts commit 5db1d491cecd9b610e9693d10b5015822429d261. --- src/config.lisp | 10 +++++++--- src/main.lisp | 17 +---------------- 2 files changed, 8 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/config.lisp b/src/config.lisp index 1bac762..55575bb 100644 --- a/src/config.lisp +++ b/src/config.lisp @@ -2,13 +2,16 @@ ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs (defpackage :ukkoclot/config (:use :c2cl :ukkoclot/hash-tables) + (:documentation + "Stuff for loading the configuration of the bot") (:export :config-load :config-merge :config-p - :config-bot-name :config-bot-token :config-db-path :config-dev-group :config-owner :config-swank-port)) + :config-bot-name :config-bot-token :config-db-path :config-dev-group :config-owner)) (in-package :ukkoclot/config) (defmacro defconfig (&rest slots-and-types) + "Macro to make the config struct creation easier." `(defstruct config ,@(loop for (name type) on slots-and-types by #'cddr collect `(,(intern (symbol-name name)) (error "No value given for ~A" ,name) :type ,type :read-only t)))) @@ -18,12 +21,13 @@ :bot-token string :db-path string :dev-group integer - :owner integer - :swank-port (integer 1 65536)) + :owner integer) (defun config-load (filename) + "Load the config from the given `filename'. All entries must be specified." (apply #'make-config (with-open-file (f filename) (read f)))) (defun config-merge (config filename) + "Merge the current config with new entries from `filename'." (loop for (name value) on (with-open-file (f filename) (read f)) by #'cddr do (setf (slot-value config (intern (symbol-name name) :ukkoclot/config)) value))) diff --git a/src/main.lisp b/src/main.lisp index 712b25d..f9720c9 100644 --- a/src/main.lisp +++ b/src/main.lisp @@ -5,7 +5,6 @@ (:use :c2cl :ukkoclot/config :ukkoclot/inline-bots :ukkoclot/tg) (:import-from :anaphora :acond :awhen :it) (:import-from :log) - (:import-from :swank) (:import-from :ukkoclot/db :with-db) (:import-from :ukkoclot/serializing :fixup-value) (:import-from :ukkoclot/state :make-bot :bot-config :bot-power-on) @@ -24,19 +23,6 @@ (error (err) (report-error bot ,evt err))) (progn ,@body))) -(defun start-swank (port) - (log:info "Starting a SWANK server on port ~A..." port) - (swank:create-server :port port :dont-close t) - (log:info - "SWANK started. You can connect to it by forwarding ports via SSH: `ssh -L~A:127.0.0.1:~A username@server.com'" - port port) - (log:info "And then afterwards M-x slime-connect giving localhost and ~A" port)) - -(defun stop-swank (port) - (log:info "Stopping the SWANK server on port ~A..." port) - (swank:stop-server port) - (log:info "Done")) - (defun main () (log:config :debug) (unwind-protect @@ -50,12 +36,11 @@ (defun main-with-config (config) (unwind-protect (progn - (start-swank (config-swank-port config)) (with-db (db (config-db-path config)) (let ((bot (make-bot config db))) ;; TODO: Catch fatal errors & report them (wrapped-main bot config)))) - (stop-swank (config-swank-port config)))) + (log:info "We're done!"))) (defun wrapped-main (bot config) (when *in-prod* -- cgit v1.2.3