diff --git a/config/config.sample.yaml b/config/config.sample.yaml index 8fb83dcb1bc2d4fae32d7f47b17691b3fa783c5c..861f013ed704b56918977bff888ea2a1525bf8c6 100644 --- a/config/config.sample.yaml +++ b/config/config.sample.yaml @@ -5,3 +5,5 @@ auth: clientID: 12345 # Get from discord secret: blah botToken: foobar +logging: + level: "warn" #silly, verbose, info, http, warn, error diff --git a/config/config.schema.yaml b/config/config.schema.yaml index 798771b14f4ebc5eb57f82021970728d0055f2eb..14dbddd7230c4bc3cadc03889d19f6a44b200aed 100644 --- a/config/config.schema.yaml +++ b/config/config.schema.yaml @@ -20,3 +20,9 @@ properties: type: "string" botToken: type: "string" + logging: + type: "object" + required: ["level"] + properties: + level: + type: "string" diff --git a/src/config.ts b/src/config.ts index d2c7779424f11a5d3296eedbc0b8858fc3b3387c..d5b266c822e99a5f8e5b372275e642ad3c04e748 100644 --- a/src/config.ts +++ b/src/config.ts @@ -3,7 +3,7 @@ export class DiscordBridgeConfig { public bridge: DiscordBridgeConfigBridge; public auth: DiscordBridgeConfigAuth; - public guilds: DiscordBridgeConfigGuilds[]; + public logging: DiscordBridgeConfigLogging; } class DiscordBridgeConfigBridge { @@ -11,13 +11,11 @@ class DiscordBridgeConfigBridge { public homeserverUrl: string; } -class DiscordBridgeConfigAuth { +export class DiscordBridgeConfigAuth { public clientID: string; public secret: string; public botToken: string; } - -class DiscordBridgeConfigGuilds { - public id: string; - public aliasName: string; +class DiscordBridgeConfigLogging { + public level: string; } diff --git a/src/discordas.ts b/src/discordas.ts index 9a2fab766f336c77d7916695e5c4e962ff191f91..1b5807922f2be99e8333ae361d5b6d772e7a6267 100644 --- a/src/discordas.ts +++ b/src/discordas.ts @@ -34,6 +34,7 @@ function generateRegistration(reg, callback) { } function run (port: number, config: DiscordBridgeConfig) { + log.level = config.logging ? (config.logging.level || "warn") : "warn"; log.info("discordas", "Starting Discord AS"); const yamlConfig = yaml.safeLoad(fs.readFileSync("discord-registration.yaml", "utf8")); const registration = AppServiceRegistration.fromObject(yamlConfig);