From dcf680a37336e016571c8b9430db14ae2ebd5d74 Mon Sep 17 00:00:00 2001 From: Ben Allfree Date: Wed, 19 Jul 2023 14:40:55 +0000 Subject: [PATCH 1/4] chore: logging fixes --- packages/daemon/package.json | 2 +- scripts/pm2.sh | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/daemon/package.json b/packages/daemon/package.json index b9262616..5e13e502 100644 --- a/packages/daemon/package.json +++ b/packages/daemon/package.json @@ -7,7 +7,7 @@ "dev": "tsx watch src/server.ts", "ddos": "NODE_ENV=development tsx watch src/stresser/index.ts", "start": "tsx src/server.ts", - "pm2": "pm2 del daemon ; pm2 start \"yarn start\" --name=daemon -o ~/logs/daemon.log -e ~/logs/daemon.log", + "pm2": "pm2 stop all; pm2 del daemon ; pm2 start \"yarn start\" --name=daemon -l /home/pockethost/logs/daemon.log", "migrate": "tsx src/migrate/migrate.ts" }, "dependencies": { diff --git a/scripts/pm2.sh b/scripts/pm2.sh index 0bfdd1a0..97c05a8b 100755 --- a/scripts/pm2.sh +++ b/scripts/pm2.sh @@ -4,7 +4,13 @@ set -a source .env set +a -mv ~/logs/daemon.log ~/logs/daemon-`date +%s`.log -truncate -s 0 packages/daemon/daemon.log +LOG_ROOT=/home/pockethost/logs +DAEMON_PREFIX=daemon +DAEMON_LOG=$LOG_ROOT/$DAEMON_PREFIX.log +RESTART_DATE=`date +%s` +echo "Server restarted at $RESTART_DATE" >> $DAEMON_LOG +mv $DAEMON_LOG $LOG_ROOT/$DAEMON_PREFIX-$RESTART_DATE.log +echo "Server started at $RESTART_DATE" >> $DAEMON_LOG +chown pockethost:pockethost -R $LOG_ROOT pkill -f 'pocketbase serve' yarn pm2 \ No newline at end of file From 27d5da95272f3b4a85a8826aa3335767b522e78c Mon Sep 17 00:00:00 2001 From: Ben Allfree Date: Wed, 19 Jul 2023 14:41:08 +0000 Subject: [PATCH 2/4] enhancement: proxy logging output fix --- packages/daemon/src/services/ProxyService.ts | 30 +++++++++++--------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/packages/daemon/src/services/ProxyService.ts b/packages/daemon/src/services/ProxyService.ts index 8e2c6ac1..8fb8acbc 100644 --- a/packages/daemon/src/services/ProxyService.ts +++ b/packages/daemon/src/services/ProxyService.ts @@ -52,20 +52,24 @@ export const proxyService = mkSingleton(async (config: ProxyServiceConfig) => { res.end(`${req.headers.host || `Domain`} was rejected.`) return } - - try { - for (let i = 0; i < middleware.length; i++) { - const m = middleware[i]! - await m(req, res) + { + const { warn } = _proxyLogger.create( + `${req.method} ${req.headers.host}/${req.url}` + ) + try { + for (let i = 0; i < middleware.length; i++) { + const m = middleware[i]! + await m(req, res) + } + } catch (e) { + const msg = (() => (e instanceof Error ? e.message : `${e}`))() + warn(msg) + res.writeHead(403, { + 'Content-Type': `text/plain`, + }) + res.end(msg) + return } - } catch (e) { - const msg = (() => (e instanceof Error ? e.message : `${e}`))() - warn(msg) - res.writeHead(403, { - 'Content-Type': `text/plain`, - }) - res.end(msg) - return } }) From 72fa946d16b839788f422f171b3f1efbf73b5f7a Mon Sep 17 00:00:00 2001 From: Ben Allfree Date: Wed, 19 Jul 2023 14:49:46 +0000 Subject: [PATCH 3/4] v0.8.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2c3472f3..42829cdf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pockethost", - "version": "0.8.1", + "version": "0.8.2", "author": "Ben Allfree ", "license": "MIT", "private": true, From b69c9ffed404d91a542aa4dc9beb72437347e854 Mon Sep 17 00:00:00 2001 From: Ben Allfree Date: Wed, 19 Jul 2023 14:50:00 +0000 Subject: [PATCH 4/4] v0.8.2 --- gitbook/development/production.md | 2 +- gitbook/releases/0.8.2.md | 45 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 gitbook/releases/0.8.2.md diff --git a/gitbook/development/production.md b/gitbook/development/production.md index 8f3822d2..30e1b19b 100644 --- a/gitbook/development/production.md +++ b/gitbook/development/production.md @@ -45,7 +45,7 @@ sudo open https://pockethost.io If all goes well: -- Update `readme.md` with latest relevant fixes. +- Update `./gitbook/releases` with latest relevant fixes. - Create a new discussion on PocketHost forum - If major release, create announcement on PocketBase forum - Use `yarn version --patch` for patch release and tag with git diff --git a/gitbook/releases/0.8.2.md b/gitbook/releases/0.8.2.md new file mode 100644 index 00000000..4fe45d57 --- /dev/null +++ b/gitbook/releases/0.8.2.md @@ -0,0 +1,45 @@ +# PocketHost 0.8.2 Release Notes + +[PocketHost](https://pockethost.io) is the zero-config 'PocketBase in the cloud' platform. Thank you for everyone's continued support for this project. + +## What's New + +This is a maintenance release. + +Highlights: + +- Fixed PocketBase version upgrade stability - `unzipper` package failing on node v18.6.0 +- Improved logging for debugging purposes +- FTP enhancements +- Database migration cleanup +- Refactor Danger Zone UI + +## Change log + +- enhancement: proxy logging output fix +- chore: logging fixes +- fix: lock node version +- fix: unzipper nodejs incompatibility +- chore: sqlite patch update +- refactor: UpdaterService +- chore: rename pocketbaseService +- fix: service template +- enh: stresser +- enh: stresser cleanup +- fix: restore pb_static in FTP service +- chore: docs cleanup +- enh: FTP support +- enh: breadcrumb fluent logging +- docs: path adjustments +- docs: maintenance mode +- fix: maintenance mode timeout fixed + +## Stats and Info + +- 359 github stars +- ~2000 registered users +- ~2700 instances created +- ~1.8 million instance invocations to date (# times PocketBase executable has been launched) +- ~400 instances active and used in the past week + +Check out the [FAQ](https://pockethost.gitbook.io/manual/overview/faq) and [roadmap](https://pockethost.gitbook.io/manual/overview/roadmap) for more details.