versia-pub/server
2
0
Fork 0
mirror of https://github.com/versia-pub/server.git synced 2026-03-13 22:09:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: ♻️ Replace logging system with @logtape/logtape

Browse source
This commit is contained in:
Jesse Wierzbinski 2024-06-26 13:11:39 -10:00
parent 75992dfe62
commit bc8220c8f9
No known key found for this signature in database
28 changed files with 324 additions and 858 deletions
Download patch file Download diff file Expand all files Collapse all files

16
database/entities/federation.ts
View file

@ -1,9 +1,9 @@
import { debugRequest } from "@/api";
import { getLogger } from "@logtape/logtape";
import { SignatureConstructor } from "@lysand-org/federation";
import type { Entity, Undo } from "@lysand-org/federation/types";
import { config } from "config-manager";
import type { User } from "~/packages/database-interface/user";
import { LogLevel, LogManager } from "~/packages/log-manager";
export const localObjectUri = (id: string) =>
new URL(`/objects/${id}`, config.http.base_url).toString();
@ -48,19 +48,13 @@ export const objectToInboxRequest = async (
// Debug request
await debugRequest(signed);
const logger = getLogger("federation");
// Log public key
new LogManager(Bun.stdout).log(
LogLevel.Debug,
"Inbox.Signature",
`Sender public key: ${author.data.publicKey}`,
);
logger.debug`Sender public key: ${author.data.publicKey}`;
// Log signed string
new LogManager(Bun.stdout).log(
LogLevel.Debug,
"Inbox.Signature",
`Signed string:\n${signedString}`,
);
logger.debug`Signed string:\n${signedString}`;
}
return signed;

17
database/entities/status.ts
View file

@ -1,7 +1,7 @@
import { mentionValidator } from "@/api";
import { dualLogger } from "@/loggers";
import { sanitizeHtml, sanitizeHtmlInline } from "@/sanitization";
import markdownItTaskLists from "@hackmd/markdown-it-task-lists";
import { getLogger } from "@logtape/logtape";
import type { ContentFormat } from "@lysand-org/federation/types";
import { config } from "config-manager";
import {
@ -35,7 +35,6 @@ import {
} from "~/drizzle/schema";
import type { Note } from "~/packages/database-interface/note";
import { User } from "~/packages/database-interface/user";
import { LogLevel } from "~/packages/log-manager";
import type { Application } from "./application";
import type { EmojiWithInstance } from "./emoji";
import { objectToInboxRequest } from "./federation";
@ -453,16 +452,10 @@ export const federateNote = async (note: Note) => {
});
if (!response.ok) {
dualLogger.log(
LogLevel.Debug,
"Federation.Status",
await response.text(),
);
dualLogger.log(
LogLevel.Error,
"Federation.Status",
`Failed to federate status ${note.data.id} to ${user.getUri()}`,
);
const logger = getLogger("federation");
logger.debug`${await response.text()}`;
logger.error`Failed to federate status ${note.data.id} to ${user.getUri()}`;
}
}
};

48
database/entities/user.ts
View file

@ -1,4 +1,4 @@
import { dualLogger } from "@/loggers";
import { getLogger } from "@logtape/logtape";
import type {
Follow,
FollowAccept,
@ -17,7 +17,6 @@ import {
Users,
} from "~/drizzle/schema";
import { User } from "~/packages/database-interface/user";
import { LogLevel } from "~/packages/log-manager";
import type { Application } from "./application";
import type { EmojiWithInstance } from "./emoji";
import { objectToInboxRequest } from "./federation";
@ -180,19 +179,10 @@ export const followRequestUser = async (
});
if (!response.ok) {
dualLogger.log(
LogLevel.Debug,
"Federation.FollowRequest",
await response.text(),
);
const logger = getLogger("federation");
dualLogger.log(
LogLevel.Error,
"Federation.FollowRequest",
`Failed to federate follow request from ${
follower.id
} to ${followee.getUri()}`,
);
logger.debug`${await response.text()}`;
logger.error`Failed to federate follow request from ${follower.id} to ${followee.getUri()}`;
await db
.update(Relationships)
@ -237,19 +227,10 @@ export const sendFollowAccept = async (follower: User, followee: User) => {
});
if (!response.ok) {
dualLogger.log(
LogLevel.Debug,
"Federation.FollowAccept",
await response.text(),
);
const logger = getLogger("federation");
dualLogger.log(
LogLevel.Error,
"Federation.FollowAccept",
`Failed to federate follow accept from ${
followee.id
} to ${follower.getUri()}`,
);
logger.debug`${await response.text()}`;
logger.error`Failed to federate follow accept from ${followee.id} to ${follower.getUri()}`;
}
};
@ -267,19 +248,10 @@ export const sendFollowReject = async (follower: User, followee: User) => {
});
if (!response.ok) {
dualLogger.log(
LogLevel.Debug,
"Federation.FollowReject",
await response.text(),
);
const logger = getLogger("federation");
dualLogger.log(
LogLevel.Error,
"Federation.FollowReject",
`Failed to federate follow reject from ${
followee.id
} to ${follower.getUri()}`,
);
logger.debug`${await response.text()}`;
logger.error`Failed to federate follow reject from ${followee.id} to ${follower.getUri()}`;
}
};