diff options
| author | Chocobozzz <me@florianbigard.com> | 2020-06-02 09:31:30 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2020-06-02 09:31:30 +0200 |
| commit | b763f88dd0f455ce0ccae9cb81182c985a47c101 (patch) | |
| tree | 56f95f165795b782832609d53b41098a7b651a99 /server/lib | |
| parent | cdd8f7790c759664fe4d0962efa550cf1a8e37eb (diff) | |
| parent | f3e887e5f0f5669d09ca6fad13f3a39095d4b2f0 (diff) | |
| download | PeerTube-b763f88dd0f455ce0ccae9cb81182c985a47c101.tar.gz PeerTube-b763f88dd0f455ce0ccae9cb81182c985a47c101.tar.zst PeerTube-b763f88dd0f455ce0ccae9cb81182c985a47c101.zip | |
Merge branch 'release/2.2.0' into develop
Diffstat (limited to 'server/lib')
| -rw-r--r-- | server/lib/emailer.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts index 935c9e882..04aade83a 100644 --- a/server/lib/emailer.ts +++ b/server/lib/emailer.ts | |||
| @@ -473,7 +473,7 @@ class Emailer { | |||
| 473 | }, | 473 | }, |
| 474 | transport: this.transporter, | 474 | transport: this.transporter, |
| 475 | views: { | 475 | views: { |
| 476 | root: join(root(), 'server', 'lib', 'emails') | 476 | root: join(root(), 'dist', 'server', 'lib', 'emails') |
| 477 | }, | 477 | }, |
| 478 | subjectPrefix: CONFIG.EMAIL.SUBJECT.PREFIX | 478 | subjectPrefix: CONFIG.EMAIL.SUBJECT.PREFIX |
| 479 | }) | 479 | }) |
| @@ -498,8 +498,8 @@ class Emailer { | |||
| 498 | }, | 498 | }, |
| 499 | options // overriden/new variables given for a specific template in the payload | 499 | options // overriden/new variables given for a specific template in the payload |
| 500 | ) as SendEmailOptions) | 500 | ) as SendEmailOptions) |
| 501 | .then(logger.info) | 501 | .then(res => logger.debug('Sent email.', { res })) |
| 502 | .catch(logger.error) | 502 | .catch(err => logger.error('Error in email sender.', { err })) |
| 503 | } | 503 | } |
| 504 | } | 504 | } |
| 505 | 505 | ||