@@ -384,8 +384,8 @@ stack_pop(int64 stackId)
384
384
if (auditEventStack != NULL && auditEventStack -> stackId == stackId )
385
385
MemoryContextDelete (auditEventStack -> contextAudit );
386
386
else
387
- elog (ERROR , "pg_audit stack item %ld not found on top - cannot pop" ,
388
- stackId );
387
+ elog (ERROR , "pg_audit stack item " INT64_FORMAT " not found on top - cannot pop" ,
388
+ stackId );
389
389
}
390
390
391
391
/*
@@ -403,10 +403,9 @@ stack_valid(int64 stackId)
403
403
404
404
/* If we didn't find it, something went wrong. */
405
405
if (nextItem == NULL )
406
- elog (ERROR , "pg_audit stack item %ld not found - top of stack is %ld" ,
407
- stackId , auditEventStack == NULL ? -1 : auditEventStack -> stackId );
408
-
409
- return ;
406
+ elog (ERROR , "pg_audit stack item " INT64_FORMAT " not found - top of stack is " INT64_FORMAT "" ,
407
+ stackId ,
408
+ auditEventStack == NULL ? (int64 ) - 1 : auditEventStack -> stackId );
410
409
}
411
410
412
411
/*
@@ -672,15 +671,21 @@ log_audit_event(AuditEventStackItem *stackItem)
672
671
appendStringInfoString (& auditStr ,
673
672
"<previously logged>,<previously logged>" );
674
673
675
- /* Log the audit entry */
676
- elog (auditLogLevel , "AUDIT: %s,%ld,%ld,%s,%s" ,
677
- stackItem -> auditEvent .granted ?
678
- AUDIT_TYPE_OBJECT : AUDIT_TYPE_SESSION ,
679
- stackItem -> auditEvent .statementId ,
680
- stackItem -> auditEvent .substatementId ,
681
- className , auditStr .data );
682
-
683
- stackItem -> auditEvent .logged = true;
674
+ /*
675
+ * Log the audit entry. Note: use of INT64_FORMAT here is bad for
676
+ * translatability, but we currently haven't got translation support in
677
+ * pg_audit anyway.
678
+ */
679
+ ereport (auditLogLevel ,
680
+ (errmsg ("AUDIT: %s," INT64_FORMAT "," INT64_FORMAT ",%s,%s" ,
681
+ stackItem -> auditEvent .granted ?
682
+ AUDIT_TYPE_OBJECT : AUDIT_TYPE_SESSION ,
683
+ stackItem -> auditEvent .statementId ,
684
+ stackItem -> auditEvent .substatementId ,
685
+ className ,
686
+ auditStr .data )));
687
+
688
+ stackItem -> auditEvent .logged = true;
684
689
685
690
MemoryContextSwitchTo (contextOld );
686
691
}
0 commit comments