mirror of
https://github.com/matrix-org/mjolnir.git
synced 2024-06-28 23:52:06 +00:00
Merge branch 'main' into gnuxie/yarn-version
This commit is contained in:
commit
619fbda41a
34
.github/workflows/docker-hub-latest.yml
vendored
Normal file
34
.github/workflows/docker-hub-latest.yml
vendored
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
# Copied from https://github.com/matrix-org/matrix-bifrost/blob/develop/.github/workflows/docker-hub-latest.yml
|
||||||
|
|
||||||
|
name: "Docker Hub - Latest"
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
|
||||||
|
env:
|
||||||
|
DOCKER_NAMESPACE: matrixdotorg
|
||||||
|
PLATFORMS: linux/amd64
|
||||||
|
# Only push if this is main, otherwise we just want to build
|
||||||
|
PUSH: ${{ github.ref == 'refs/heads/main' }}
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
docker-latest:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Check out
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
- name: Log in to Docker Hub
|
||||||
|
uses: docker/login-action@v1
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKER_HUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Build image
|
||||||
|
uses: docker/build-push-action@v2
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
file: ./Dockerfile
|
||||||
|
platforms: ${{ env.PLATFORMS }}
|
||||||
|
push: ${{ env.PUSH }}
|
||||||
|
tags: |
|
||||||
|
${{ env.DOCKER_NAMESPACE }}/mjolnir:latest
|
35
.github/workflows/docker-hub-release.yml
vendored
Normal file
35
.github/workflows/docker-hub-release.yml
vendored
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
# Copied from https://github.com/matrix-org/matrix-bifrost/blob/develop/.github/workflows/docker-hub-release.yml
|
||||||
|
|
||||||
|
name: "Docker Hub - Release"
|
||||||
|
|
||||||
|
on:
|
||||||
|
release:
|
||||||
|
types: [published]
|
||||||
|
|
||||||
|
env:
|
||||||
|
DOCKER_NAMESPACE: matrixdotorg
|
||||||
|
PLATFORMS: linux/amd64
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
docker-release:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Check out
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
- name: Get release tag
|
||||||
|
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
|
||||||
|
- name: Log in to Docker Hub
|
||||||
|
uses: docker/login-action@v1
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKER_HUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Build image
|
||||||
|
uses: docker/build-push-action@v2
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
file: ./Dockerfile
|
||||||
|
platforms: ${{ env.PLATFORMS }}
|
||||||
|
push: true
|
||||||
|
tags: |
|
||||||
|
${{ env.DOCKER_NAMESPACE }}/mjolnir:${{ env.RELEASE_VERSION }}
|
|
@ -120,7 +120,7 @@ modules:
|
||||||
# these rooms.
|
# these rooms.
|
||||||
ban_lists:
|
ban_lists:
|
||||||
- "!roomid:example.org"
|
- "!roomid:example.org"
|
||||||
message_max_length:
|
#message_max_length:
|
||||||
# Limit the characters in a message (event body) that a client can send in an event on this server.
|
# Limit the characters in a message (event body) that a client can send in an event on this server.
|
||||||
# By default there is no limit (beyond the the limit the spec enforces on event size).
|
# By default there is no limit (beyond the the limit the spec enforces on event size).
|
||||||
# Uncomment if you want messages to be limited to 510 characters.
|
# Uncomment if you want messages to be limited to 510 characters.
|
||||||
|
|
|
@ -32,6 +32,7 @@ homeserver:
|
||||||
registration_shared_secret: REGISTRATION_SHARED_SECRET
|
registration_shared_secret: REGISTRATION_SHARED_SECRET
|
||||||
# Make manual testing easier
|
# Make manual testing easier
|
||||||
enable_registration: true
|
enable_registration: true
|
||||||
|
enable_registration_without_verification: true
|
||||||
|
|
||||||
# We remove rc_message so we can test rate limiting,
|
# We remove rc_message so we can test rate limiting,
|
||||||
# but we keep the others because of https://github.com/matrix-org/synapse/issues/11785
|
# but we keep the others because of https://github.com/matrix-org/synapse/issues/11785
|
||||||
|
|
|
@ -320,11 +320,12 @@ export class Mjolnir {
|
||||||
try {
|
try {
|
||||||
LogService.error("Mjolnir", "Error during startup:");
|
LogService.error("Mjolnir", "Error during startup:");
|
||||||
LogService.error("Mjolnir", extractRequestError(err));
|
LogService.error("Mjolnir", extractRequestError(err));
|
||||||
|
this.stop();
|
||||||
await this.logMessage(LogLevel.ERROR, "Mjolnir@startup", "Startup failed due to error - see console");
|
await this.logMessage(LogLevel.ERROR, "Mjolnir@startup", "Startup failed due to error - see console");
|
||||||
|
throw err;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// If we failed to handle the error, just crash
|
LogService.error("Mjolnir", `Failed to report startup error to the management room: ${e}`);
|
||||||
console.error(e);
|
throw err;
|
||||||
process.exit(1);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,9 +57,14 @@ if (config.health.healthz.enabled) {
|
||||||
config.RUNTIME.client = client;
|
config.RUNTIME.client = client;
|
||||||
|
|
||||||
bot = await Mjolnir.setupMjolnirFromConfig(client);
|
bot = await Mjolnir.setupMjolnirFromConfig(client);
|
||||||
|
} catch (err) {
|
||||||
|
console.error(`Failed to setup mjolnir from the config ${config.dataPath}: ${err}`);
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
try {
|
||||||
await bot.start();
|
await bot.start();
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
bot?.logMessage(LogLevel.ERROR, "index", err);
|
console.error(`Mjolnir failed to start: ${err}`);
|
||||||
process.exit(1);
|
throw err;
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user