moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More log updates

This commit is contained in:
Bryan Ashby 2023-04-26 19:08:31 -06:00
parent a5a72d8270
commit 0c1785c462
No known key found for this signature in database
GPG Key ID: C2C1B501E4EFD994
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/servers/content/web_handlers/activitypub.js
View File

@ -48,6 +48,7 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
enigma_assert(webServer, 'ActivityPub Web Handler init without webServer'); enigma_assert(webServer, 'ActivityPub Web Handler init without webServer');
this.log = webServer.logger().child({ webHandler: 'ActivityPub' }); this.log = webServer.logger().child({ webHandler: 'ActivityPub' });
this.sysLog = SysLog.child({ webHandler: 'ActivityPub' });
Events.addListener(Events.getSystemEvents().NewUserPrePersist, eventInfo => { Events.addListener(Events.getSystemEvents().NewUserPrePersist, eventInfo => {
const { user, callback } = eventInfo; const { user, callback } = eventInfo;
@ -398,7 +399,7 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
_inboxAcceptFollowActivity(resp, activity) { _inboxAcceptFollowActivity(resp, activity) {
// Currently Accept's to Follow's are really just a formality; // Currently Accept's to Follow's are really just a formality;
// we'll log it, but that's about it for now // we'll log it, but that's about it for now
SysLog.info( this.log.info(
{ {
remoteActorId: activity.actor, remoteActorId: activity.actor,
localActorId: _.get(activity, 'object.actor'), localActorId: _.get(activity, 'object.actor'),
@ -628,7 +629,12 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
// :TODO: log me // :TODO: log me
} }
SysLog.info({ stats, inboxType }, 'Inbox Delete request complete'); this.sysLog.info(
{ stats, inboxType },
`AP: ${_.startCase(inboxType)} delete request complete (${
stats.deleted.length
})`
);
return this.webServer.accepted(resp); return this.webServer.accepted(resp);
} }
); );
@ -804,7 +810,7 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
return this.webServer.internalServerError(resp, err); return this.webServer.internalServerError(resp, err);
} }
SysLog.info( this.log.info(
{ {
username: localUser.username, username: localUser.username,
userId: localUser.userId, userId: localUser.userId,
@ -908,13 +914,13 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
return this.webServer.internalServerError(resp, err); return this.webServer.internalServerError(resp, err);
} }
SysLog.info( this.sysLog.info(
{ {
inboxType, inboxType,
objectId: targetObjectId, objectId: targetObjectId,
objectType, objectType,
}, },
`${objectType} Updated` `AP: ${_.startCase(inboxType)} '${objectType}' updated`
); );
// Update any assoc Message object // Update any assoc Message object
@ -928,9 +934,9 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
} }
_deliverNoteToSharedInbox(activity, note, cb) { _deliverNoteToSharedInbox(activity, note, cb) {
SysLog.info( this.log.info(
{ activityId: activity.id, noteId: note.id }, { activityId: activity.id, noteId: note.id },
'Delivering Note to Public/Shared inbox' "Delivering 'Note' to Public/Shared inbox"
); );
Collection.addSharedInboxItem(activity, true, err => { Collection.addSharedInboxItem(activity, true, err => {
@ -966,7 +972,7 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
actorId, actorId,
username: localUser.username, username: localUser.username,
}, },
`Delivering private Note to local Actor "${localUser.username}"` `AP: Delivering private 'Note' to user "${localUser.username}"`
); );
Collection.addInboxItem(activity, localUser, false, err => { Collection.addInboxItem(activity, localUser, false, err => {
@ -1006,14 +1012,15 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
if (_.isObject(localAddressedTo)) { if (_.isObject(localAddressedTo)) {
localAddressedTo = localAddressedTo.username; localAddressedTo = localAddressedTo.username;
} }
this.log.info(
this.sysLog.info(
{ {
localAddressedTo, localAddressedTo,
activityId, activityId,
noteId: note.id, noteId: note.id,
messageId, messageId,
}, },
'Note persisted as local Message' `AP: Saved 'Note' to "${localAddressedTo}" as message ${messageId}`
); );
} else if (err.code === 'SQLITE_CONSTRAINT') { } else if (err.code === 'SQLITE_CONSTRAINT') {
return cb(null); return cb(null);
@ -1218,7 +1225,7 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
_prepareNewUserAsActor(user, cb) { _prepareNewUserAsActor(user, cb) {
this.sysLog.info( this.sysLog.info(
{ username: user.username, userId: user.userId }, { username: user.username, userId: user.userId },
`Preparing ActivityPub settings for "${user.username}"` `AP: Preparing ActivityPub settings for "${user.username}"`
); );
return prepareLocalUserAsActor(user, { force: false }, cb); return prepareLocalUserAsActor(user, { force: false }, cb);