Skip to content

Commit 1429872

Browse files
authored
Merge pull request #3971 from elizaOS/minor-log-api-disp-fix
fix: log display and apis
2 parents a4e3b51 + 3b928c4 commit 1429872

File tree

2 files changed

+31
-15
lines changed

2 files changed

+31
-15
lines changed

packages/cli/src/server/api/index.ts

+19-11
Original file line numberDiff line numberDiff line change
@@ -515,9 +515,9 @@ export function createApiRouter(
515515
// Logs endpoint
516516
const logsHandler = (req, res) => {
517517
const since = req.query.since ? Number(req.query.since) : Date.now() - 3600000; // Default 1 hour
518-
const requestedLevel = (req.query.level?.toString().toLowerCase() || 'info') as LogLevel;
519-
const agentName = req.query.agentName?.toString();
520-
const agentId = req.query.agentId?.toString(); // Add support for agentId parameter
518+
const requestedLevel = (req.query.level?.toString().toLowerCase() || 'all') as LogLevel;
519+
const requestedAgentName = req.query.agentName?.toString() || 'all';
520+
const requestedAgentId = req.query.agentId?.toString() || 'all'; // Add support for agentId parameter
521521
const limit = Math.min(Number(req.query.limit) || 100, 1000); // Max 1000 entries
522522

523523
// Access the underlying logger instance
@@ -540,17 +540,23 @@ export function createApiRouter(
540540
// Filter by time always
541541
const timeMatch = log.time >= since;
542542

543-
// Filter by level
543+
// Filter by level - return all logs if requestedLevel is 'all'
544544
let levelMatch = true;
545545
if (requestedLevel && requestedLevel !== 'all') {
546546
levelMatch = log.level === requestedLevelValue;
547547
}
548548

549-
// Filter by agentName if provided
550-
const agentNameMatch = agentName ? log.agentName === agentName : true;
549+
// Filter by agentName if provided - return all if 'all'
550+
const agentNameMatch =
551+
!requestedAgentName || requestedAgentName === 'all'
552+
? true
553+
: log.agentName === requestedAgentName;
551554

552-
// Filter by agentId if provided
553-
const agentIdMatch = agentId ? log.agentId === agentId : true;
555+
// Filter by agentId if provided - return all if 'all'
556+
const agentIdMatch =
557+
!requestedAgentId || requestedAgentId === 'all'
558+
? true
559+
: log.agentId === requestedAgentId;
554560

555561
return timeMatch && levelMatch && agentNameMatch && agentIdMatch;
556562
})
@@ -560,8 +566,8 @@ export function createApiRouter(
560566
logger.debug('Logs request processed', {
561567
requestedLevel,
562568
requestedLevelValue,
563-
agentName,
564-
agentId,
569+
requestedAgentName,
570+
requestedAgentId,
565571
filteredCount: filtered.length,
566572
totalLogs: recentLogs.length,
567573
});
@@ -570,7 +576,9 @@ export function createApiRouter(
570576
logs: filtered,
571577
count: filtered.length,
572578
total: recentLogs.length,
573-
level: requestedLevel,
579+
requestedLevel: requestedLevel,
580+
agentName: requestedAgentName,
581+
agentId: requestedAgentId,
574582
levels: Object.keys(LOG_LEVELS),
575583
});
576584
} catch (error) {

packages/client/src/lib/api.ts

+12-4
Original file line numberDiff line numberDiff line change
@@ -346,12 +346,20 @@ export const apiClient = {
346346
},
347347

348348
// Add this new method
349-
getLogs: ({ level = '', agentName = 'all', agentId = 'all' }): Promise<LogResponse> => {
349+
getLogs: ({
350+
level,
351+
agentName,
352+
agentId,
353+
}: {
354+
level?: string;
355+
agentName?: string;
356+
agentId?: string;
357+
}): Promise<LogResponse> => {
350358
const params = new URLSearchParams();
351359

352-
if (level && level !== 'all') params.append('level', level);
353-
if (agentName && agentName !== 'all') params.append('agentName', agentName);
354-
if (agentId && agentId !== 'all') params.append('agentId', agentId);
360+
if (level) params.append('level', level);
361+
if (agentName) params.append('agentName', agentName);
362+
if (agentId) params.append('agentId', agentId);
355363

356364
const url = `/logs${params.toString() ? `?${params.toString()}` : ''}`;
357365
return fetcher({

0 commit comments

Comments
 (0)