Skip to content

Commit b64f18c

Browse files
alvherrealvherre
committed
Mark some untranslatable messages with errmsg_internal
1 parent a2a5ce6 commit b64f18c

File tree

1 file changed

+31
-25
lines changed
  • src/backend/access/transam

1 file changed

+31
-25
lines changed

‎src/backend/access/transam/xlog.c

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5306,22 +5306,22 @@ readRecoveryCommandFile(void)
53065306
{
53075307
recoveryRestoreCommand = pstrdup(item->value);
53085308
ereport(DEBUG2,
5309-
(errmsg("restore_command = '%s'",
5310-
recoveryRestoreCommand)));
5309+
(errmsg_internal("restore_command = '%s'",
5310+
recoveryRestoreCommand)));
53115311
}
53125312
else if (strcmp(item->name, "recovery_end_command") == 0)
53135313
{
53145314
recoveryEndCommand = pstrdup(item->value);
53155315
ereport(DEBUG2,
5316-
(errmsg("recovery_end_command = '%s'",
5317-
recoveryEndCommand)));
5316+
(errmsg_internal("recovery_end_command = '%s'",
5317+
recoveryEndCommand)));
53185318
}
53195319
else if (strcmp(item->name, "archive_cleanup_command") == 0)
53205320
{
53215321
archiveCleanupCommand = pstrdup(item->value);
53225322
ereport(DEBUG2,
5323-
(errmsg("archive_cleanup_command = '%s'",
5324-
archiveCleanupCommand)));
5323+
(errmsg_internal("archive_cleanup_command = '%s'",
5324+
archiveCleanupCommand)));
53255325
}
53265326
else if (strcmp(item->name, "pause_at_recovery_target") == 0)
53275327
{
@@ -5330,7 +5330,8 @@ readRecoveryCommandFile(void)
53305330
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
53315331
errmsg("parameter \"%s\" requires a Boolean value", "pause_at_recovery_target")));
53325332
ereport(DEBUG2,
5333-
(errmsg("pause_at_recovery_target = '%s'", item->value)));
5333+
(errmsg_internal("pause_at_recovery_target = '%s'",
5334+
item->value)));
53345335
}
53355336
else if (strcmp(item->name, "recovery_target_timeline") == 0)
53365337
{
@@ -5348,10 +5349,10 @@ readRecoveryCommandFile(void)
53485349
}
53495350
if (rtli)
53505351
ereport(DEBUG2,
5351-
(errmsg("recovery_target_timeline = %u", rtli)));
5352+
(errmsg_internal("recovery_target_timeline = %u", rtli)));
53525353
else
53535354
ereport(DEBUG2,
5354-
(errmsg("recovery_target_timeline = latest")));
5355+
(errmsg_internal("recovery_target_timeline = latest")));
53555356
}
53565357
else if (strcmp(item->name, "recovery_target_xid") == 0)
53575358
{
@@ -5362,8 +5363,8 @@ readRecoveryCommandFile(void)
53625363
(errmsg("recovery_target_xid is not a valid number: \"%s\"",
53635364
item->value)));
53645365
ereport(DEBUG2,
5365-
(errmsg("recovery_target_xid = %u",
5366-
recoveryTargetXid)));
5366+
(errmsg_internal("recovery_target_xid = %u",
5367+
recoveryTargetXid)));
53675368
recoveryTarget = RECOVERY_TARGET_XID;
53685369
}
53695370
else if (strcmp(item->name, "recovery_target_time") == 0)
@@ -5386,8 +5387,8 @@ readRecoveryCommandFile(void)
53865387
ObjectIdGetDatum(InvalidOid),
53875388
Int32GetDatum(-1)));
53885389
ereport(DEBUG2,
5389-
(errmsg("recovery_target_time = '%s'",
5390-
timestamptz_to_str(recoveryTargetTime))));
5390+
(errmsg_internal("recovery_target_time = '%s'",
5391+
timestamptz_to_str(recoveryTargetTime))));
53915392
}
53925393
else if (strcmp(item->name, "recovery_target_name") == 0)
53935394
{
@@ -5403,11 +5404,12 @@ readRecoveryCommandFile(void)
54035404
if (strlen(recoveryTargetName) >= MAXFNAMELEN)
54045405
ereport(FATAL,
54055406
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
5406-
errmsg("recovery_target_name is too long (maximum %d characters)", MAXFNAMELEN - 1)));
5407+
errmsg("recovery_target_name is too long (maximum %d characters)",
5408+
MAXFNAMELEN - 1)));
54075409

54085410
ereport(DEBUG2,
5409-
(errmsg("recovery_target_name = '%s'",
5410-
recoveryTargetName)));
5411+
(errmsg_internal("recovery_target_name = '%s'",
5412+
recoveryTargetName)));
54115413
}
54125414
else if (strcmp(item->name, "recovery_target_inclusive") == 0)
54135415
{
@@ -5417,32 +5419,35 @@ readRecoveryCommandFile(void)
54175419
if (!parse_bool(item->value, &recoveryTargetInclusive))
54185420
ereport(ERROR,
54195421
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
5420-
errmsg("parameter \"%s\" requires a Boolean value", "recovery_target_inclusive")));
5422+
errmsg("parameter \"%s\" requires a Boolean value",
5423+
"recovery_target_inclusive")));
54215424
ereport(DEBUG2,
5422-
(errmsg("recovery_target_inclusive = %s", item->value)));
5425+
(errmsg_internal("recovery_target_inclusive = %s",
5426+
item->value)));
54235427
}
54245428
else if (strcmp(item->name, "standby_mode") == 0)
54255429
{
54265430
if (!parse_bool(item->value, &StandbyMode))
54275431
ereport(ERROR,
54285432
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
5429-
errmsg("parameter \"%s\" requires a Boolean value", "standby_mode")));
5433+
errmsg("parameter \"%s\" requires a Boolean value",
5434+
"standby_mode")));
54305435
ereport(DEBUG2,
5431-
(errmsg("standby_mode = '%s'", item->value)));
5436+
(errmsg_internal("standby_mode = '%s'", item->value)));
54325437
}
54335438
else if (strcmp(item->name, "primary_conninfo") == 0)
54345439
{
54355440
PrimaryConnInfo = pstrdup(item->value);
54365441
ereport(DEBUG2,
5437-
(errmsg("primary_conninfo = '%s'",
5438-
PrimaryConnInfo)));
5442+
(errmsg_internal("primary_conninfo = '%s'",
5443+
PrimaryConnInfo)));
54395444
}
54405445
else if (strcmp(item->name, "trigger_file") == 0)
54415446
{
54425447
TriggerFile = pstrdup(item->value);
54435448
ereport(DEBUG2,
5444-
(errmsg("trigger_file = '%s'",
5445-
TriggerFile)));
5449+
(errmsg_internal("trigger_file = '%s'",
5450+
TriggerFile)));
54465451
}
54475452
else
54485453
ereport(FATAL,
@@ -7978,7 +7983,8 @@ RecoveryRestartPoint(const CheckPoint *checkPoint)
79787983
if (RmgrTable[rmid].rm_safe_restartpoint != NULL)
79797984
if (!(RmgrTable[rmid].rm_safe_restartpoint()))
79807985
{
7981-
elog(trace_recovery(DEBUG2), "RM %d not safe to record restart point at %X/%X",
7986+
elog(trace_recovery(DEBUG2),
7987+
"RM %d not safe to record restart point at %X/%X",
79827988
rmid,
79837989
checkPoint->redo.xlogid,
79847990
checkPoint->redo.xrecoff);

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy