diff --git a/build.sh b/deploy.sh similarity index 72% rename from build.sh rename to deploy.sh index a5f2a26..e6e200a 100755 --- a/build.sh +++ b/deploy.sh @@ -1,9 +1,5 @@ #!/bin/sh -set -e - export AWS_PROFILE=personal -docker buildx build --platform linux/amd64,linux/arm64 -t 853019563312.dkr.ecr.eu-central-1.amazonaws.com/micro-blog-fetchers-homelabstack:latest --push . - -echo "Image pushed to ECR" +docker buildx build --platform linux/amd64,linux/arm64 -t 853019563312.dkr.ecr.eu-central-1.amazonaws.com/micro-blog-fetchers-homelabstack:latest --push . \ No newline at end of file diff --git a/src/micro_blog/api.clj b/src/micro_blog/api.clj index b200cb6..38262e1 100644 --- a/src/micro_blog/api.clj +++ b/src/micro_blog/api.clj @@ -4,11 +4,10 @@ [micro-blog.config :refer [config]] micro-blog.mastodon micro-blog.blue-sky - micro-blog.nostr [taoensso.telemere :as tel])) (defn mastodon-proc-handler [_request] - (let [msg "Procding Mastodon Scrape"] + (let [msg "Proceding Mastodon Scrape"] (tel/log! :info msg) (micro-blog.mastodon/run) {:status 200 @@ -16,23 +15,14 @@ (defn blue-sky-proc-handler [_request] (let [msg "Procing BlueSky Scrape"] - (tel/log! :info msg) - (micro-blog.mastodon/run) - {:status 200 - :body msg})) - -(defn nostr-proc-handler [_request] - (let [msg "Restarting Nostr scraper"] - (tel/log! :info msg) - (micro-blog.nostr/close) - (micro-blog.nostr/start) - {:status 200 - :body msg})) + (tel/log! :info msg) + (micro-blog.mastodon/run) + {:status 200 + :body msg})) (def routes #{["/bluesky" :get blue-sky-proc-handler :route-name :blue-sky] - ["/mastodon" :get mastodon-proc-handler :route-name :mastodon] - ["/nostr" :get nostr-proc-handler :route-name :nostr]}) + ["/mastodon" :get mastodon-proc-handler :route-name :mastodon]}) (defn create-connector [] (-> (conn/default-connector-map (:api-host @config) (Integer/parseInt (str (:api-port @config)))) diff --git a/src/micro_blog/nostr.clj b/src/micro_blog/nostr.clj index 9a5a3de..1aecdc5 100644 --- a/src/micro_blog/nostr.clj +++ b/src/micro_blog/nostr.clj @@ -53,7 +53,6 @@ pb/save-post))))) (def socket (atom nil)) -(declare start) (defn connect [] (tel/log! :info "Opening websocket connection to nostr relay") (reset! socket @(ws/websocket (@config :nostr-relay) @@ -61,11 +60,7 @@ :on-message (fn [_ws msg _last?] (process-msg msg)) :on-close (fn [_ws status reason] - (tel/log! {:level :warn :data {:status status :reason reason}} "WebSocket connection closed") - (future - (Thread/sleep (* 5 60 1000)) - (tel/log! :info "Reconnecting WebSocket") - (start)))}))) + (tel/log! {:level :warn :data {:status status :reason reason}} "WebSocket connection closed"))}))) (defn subscribe-to-author [pubkey since] (let [sub-id (@config :nostr-fetcher-id) @@ -74,7 +69,6 @@ (.get (ws/send! @socket msg)))) (defn close [] - (tel/log! :info "Closing nostr socket") (ws/close! @socket)) (defn start []