lib/fediblock.js

@@ -68,7 +68,6 @@ module.exports = async (client, apex, app) => {
 							requestPart(`https://${instance}/api/v1/instance/peers`)
 						])
 					if (instancelocated.length === 0) {
-						try {
 						await client.index({
 							index: constant.index,
 							body: {
@@ -80,10 +79,6 @@ module.exports = async (client, apex, app) => {
 								last: new Date()
 							}
 						})
-						} catch (e) {
-							console.error(e)
-							return
-						}
 						app.locals.created++
 						return await util.sendFederatedMessage(constant.nick, 'New Fediblock Instance', `Fediblock Instance ${instance} with ${json.length} blocks - https://${constant.apexdomain}#${instance}`, getAccount(api))
 					} else {
@@ -94,7 +89,6 @@ module.exports = async (client, apex, app) => {
 								|| !instancelocated[0]._source.api
 								|| !instancelocated[0]._source.nodeinfo
 								|| !instancelocated[0]._source.peers) {
-								try {
 								await client.update({
 									index: constant.index,
 									id: instancelocated[0]._id,
@@ -107,10 +101,6 @@ module.exports = async (client, apex, app) => {
 									},
 									doc_as_upsert: true
 								})
-								} catch (e) {
-									console.error(e)
-									return
-								}
 								app.locals.updated++
 								if (instancelocated[0]._source.api && instancelocated[0]._source.api.uri && instancelocated[0]._source.api.contact_account && instancelocated[0]._source.api.contact_account.acct) {
 									const difference = blocks.filter(block => block.domain && block.domain.trim().length > 0 && !elasticinstance.some(instance => block.domain === instance.domain))
@@ -144,17 +134,17 @@ module.exports = async (client, apex, app) => {
 						app.locals.scan.emit('data', 'data: ' + (app.locals.scannum > 0 ? '(' + app.locals.scannum-- + ':' + (index + 1) + '): ' + instance : ': ' + instance) + '\n\n')
 						app.locals.peers++
 						await scanInstance(instance)
+						global.gc()
 					} catch (e) {
 						console.error(e)
 					}
 				}
-				global.gc()
-				yield 0
 			} catch (e) {
-				global.gc()
 				console.error(e)
 				yield 1
 			}
+			global.gc()
+			yield 0
 		},
 		scanIndex = async (server, instancesall) => {
 			try {
@@ -259,7 +249,7 @@ module.exports = async (client, apex, app) => {
 						}
 						await Promise.all(parts.map(async (p, i) => {
 							for await (const exit of scanPart(p, i)) {
-								console.log('Done: ' + server + ' - ' + i + ' parts with exit ' + exit + '.')
+								console.log(`Scan finished ${server} - index ${i} - exit ${exit}`)
 							}
 						}))
 						return await scanReturn()