Consistent spacing for lengthy error messages

Also, we removed the display of the current value of
max_connections/MaxBackends from some messages earlier, because it was
confusing, so do that in the remaining one as well.
This commit is contained in:
Peter Eisentraut 2011-05-19 21:36:57 +03:00
parent a937b07121
commit bb46d42859
2 changed files with 4 additions and 6 deletions

View File

@ -116,16 +116,14 @@ InternalIpcSemaphoreCreate(IpcSemaphoreKey semKey, int numSems)
(unsigned long) semKey, numSems, (unsigned long) semKey, numSems,
IPC_CREAT | IPC_EXCL | IPCProtection), IPC_CREAT | IPC_EXCL | IPCProtection),
(errno == ENOSPC) ? (errno == ENOSPC) ?
errhint("This error does *not* mean that you have run out of disk space.\n" errhint("This error does *not* mean that you have run out of disk space. "
"It occurs when either the system limit for the maximum number of " "It occurs when either the system limit for the maximum number of "
"semaphore sets (SEMMNI), or the system wide maximum number of " "semaphore sets (SEMMNI), or the system wide maximum number of "
"semaphores (SEMMNS), would be exceeded. You need to raise the " "semaphores (SEMMNS), would be exceeded. You need to raise the "
"respective kernel parameter. Alternatively, reduce PostgreSQL's " "respective kernel parameter. Alternatively, reduce PostgreSQL's "
"consumption of semaphores by reducing its max_connections parameter " "consumption of semaphores by reducing its max_connections parameter.\n"
"(currently %d).\n"
"The PostgreSQL documentation contains more information about " "The PostgreSQL documentation contains more information about "
"configuring your system for PostgreSQL.", "configuring your system for PostgreSQL.") : 0));
MaxBackends) : 0));
} }
return semId; return semId;

View File

@ -173,7 +173,7 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size)
"memory configuration.", "memory configuration.",
(unsigned long) size) : 0, (unsigned long) size) : 0,
(errno == ENOSPC) ? (errno == ENOSPC) ?
errhint("This error does *not* mean that you have run out of disk space. " errhint("This error does *not* mean that you have run out of disk space. "
"It occurs either if all available shared memory IDs have been taken, " "It occurs either if all available shared memory IDs have been taken, "
"in which case you need to raise the SHMMNI parameter in your kernel, " "in which case you need to raise the SHMMNI parameter in your kernel, "
"or because the system's overall limit for shared memory has been " "or because the system's overall limit for shared memory has been "