CR fixes

src/mail-scheduler/index.ts

@@ -5,6 +5,7 @@ import { ConfigVariable, config } from '../utils/config'
 import { uniqueId } from '../utils/crypto'
 import { globalEm } from '../utils/globalEm'
 import { createMailContent, executeMailDelivery } from './utils'
+import { updateJoystreamPrice } from '../utils/joystreamPrice'
 
 export async function getMaxAttempts(em: EntityManager): Promise<number> {
  const maxAttempts = await config.get(ConfigVariable.EmailNotificationDeliveryMaxAttempts, em)
@@ -31,6 +32,7 @@ export async function mailsToDeliver(em: EntityManager): Promise<NotificationEma
 
 export async function deliverEmails() {
  const em = await globalEm
+ await updateJoystreamPrice()
  const newEmailDeliveries = await mailsToDeliver(em)
  const maxAttempts = await getMaxAttempts(em)
  const appName = await config.get(ConfigVariable.AppName, em)

src/processor.ts

@@ -382,7 +382,7 @@ processor.run(new TypeormDatabase({ isolationLevel: 'READ COMMITTED' }), async (
  await updateJoystreamPrice()
  schedulePriceUpdate()
  .then(() => undefined)
- .catch(() => ctx.log.error('Fetching JOYSTREAM price failed'))
+ .catch(() => undefined)
  }
 
  const overlay = await EntityManagerOverlay.create(ctx.store, afterDbUpdate)

src/utils/joystreamPrice.ts

@@ -10,9 +10,14 @@ const MAX_SAFE_NUMBER_BN = new BN(Number.MAX_SAFE_INTEGER)
 const log = createLogger('price')
 
 export const updateJoystreamPrice = async () => {
- const data = await fetch('https://status.joystream.org/price')
- const json = await data.json()
- JOYSTREAM_USD_PRICE = +json.price ?? 0
+ // we don't care if the request fails, app should continue to work w/o joy price
+ const data = await fetch('https://status.joystream.org/price').catch(() =>
+ log.error('Fetching JOYSTREAM price failed')
+ )
+ if (data) {
+ const json = await data.json()
+ JOYSTREAM_USD_PRICE = +json.price ?? 0
+ }
 }
 
 export const schedulePriceUpdate = async (): Promise<void> => {