diff --git a/.env.example b/.env.example index 999d10fc5..113983b5a 100644 --- a/.env.example +++ b/.env.example @@ -22,7 +22,7 @@ USER_FEEDS_DISCORD_API_TOKEN="BOT_TOKEN_HERE" DISCORD_REST_LISTENER_BOT_TOKEN="BOT_TOKEN_HERE" DISCORD_REST_LISTENER_BOT_CLIENT_ID="BOT_CLIENT_ID_HERE" -FEED_REQUESTS_FEED_REQUEST_DEFAULT_USER_AGENT="Self-Hosted MonitoRSS/1.0" +FEED_REQUESTS_FEED_REQUEST_DEFAULT_USER_AGENT="MonitoRSS [Self-Hosted]/1.0" # Disable feeds after 5*(2^11) minutes, or 6.25 days FEED_REQUESTS_MAX_FAIL_ATTEMPTS=11 diff --git a/README.md b/README.md index 796a23b0b..572a5aa45 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,13 @@ Docker is required to easily coordinate and run multiple services at once. 5. Create a copy of the existing `.env.example` file and rename it to `.env.prod` 6. Replace all relevant values in the `.env.prod` file with your own values 1. If you have your own MongoDB instance, set `BACKEND_API_MONGODB_URI` to your MongoDB URI - 2. Replace all instances of "BOT_TOKEN_HERE" with your Discord bot application token - 3. Replace all instances of "BOT_CLIENT_ID_HERE" with your Discord bot application ID - 4. Replace all instances of "BOT_CLIENT_SECRET_HERE" with your Discord bot application secret - 5. Set `BACKEND_API_SESSION_SECRET` to a random 64-character string - 6. Set `BACKEND_API_SESSION_SALT` to a random 16-character string - 7. Add `http://localhost:8000/api/v1/discord/callback-v2` to the list of redirect URIs in your Discord application in the OAuth2 page + 2. Add your email at the end of `FEED_REQUESTS_FEED_REQUEST_DEFAULT_USER_AGENT` for feed hosts to be able to contact you if you violate their usage policies. For example, `MonitoRSS [Self-Hosted]/1.0 youremail@email.com`. + 3. Replace all instances of "BOT_TOKEN_HERE" with your Discord bot application token + 4. Replace all instances of "BOT_CLIENT_ID_HERE" with your Discord bot application ID + 5. Replace all instances of "BOT_CLIENT_SECRET_HERE" with your Discord bot application secret + 6. Set `BACKEND_API_SESSION_SECRET` to a random 64-character string + 7. Set `BACKEND_API_SESSION_SALT` to a random 16-character string + 8. Add `http://localhost:8000/api/v1/discord/callback-v2` to the list of redirect URIs in your Discord application in the OAuth2 page 7. Run `docker compose up -d` - If you run into issues with network timeouts, pass the parallel flag to only build 1 container at once: `docker compose --parallel 1 up -d` - Any containers ending in `-migration` do not need to be running diff --git a/services/feed-requests/src/feed-fetcher/feed-fetcher-listener.service.ts b/services/feed-requests/src/feed-fetcher/feed-fetcher-listener.service.ts index 483b8fe37..8bdbd94de 100644 --- a/services/feed-requests/src/feed-fetcher/feed-fetcher-listener.service.ts +++ b/services/feed-requests/src/feed-fetcher/feed-fetcher-listener.service.ts @@ -101,8 +101,8 @@ export class FeedFetcherListenerService { await this.hostRateLimiterService.incrementUrlCount(url); if (isRateLimited) { - logger.debug( - `Host ${url} is still rate limited, retrying later`, + logger.info( + `Host of ${url} is still rate limited, retrying later`, ); }