Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid bogus journal filling errors #536

Merged
merged 2 commits into from
Dec 11, 2024
Merged

Avoid bogus journal filling errors #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
680af40
Fix typos and clarify man page.
jnovy Dec 3, 2024
02c6ea6
Avoid bogus journal filling errors
jnovy Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/conmon.8.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Path to the process spec for execution.
Path to the program to execute when the container terminates its execution.

**--exit-command-arg**
Additional arguments to pass to the exit command. Can be specified multiple time.
Additional arguments to pass to the exit command. Can be specified multiple times.

**--exit-delay**
Delay before invoking the exit command (in seconds).
Expand All @@ -64,7 +64,7 @@ Leave stdin open when the attached client disconnects.
Print debug logs based on the log level.

**--log-size-max**
Maximum size of the log file.
Maximum size of the log file (in bytes).

**--log-tag**
Additional tag to use for logging.
Expand Down Expand Up @@ -94,7 +94,7 @@ PID file for the conmon process.
Path to store runtime data for the container.

**--replace-listen-pid**
Replace listen pid if set for oci-runtime pid.
Replace listen PID if set for oci-runtime PID.

**--restore**
Restore a container from a checkpoint.
Expand All @@ -106,7 +106,7 @@ Additional arguments to pass to the runtime. Can be specified multiple times.
Additional options to pass to the restore or exec command. Can be specified multiple times.

**-s**, **--systemd-cgroup**
Enable systemd cgroup manager, rather then use the cgroupfs directly.
Enable systemd cgroup manager, rather than use the cgroupfs directly.

**--socket-dir-path**
Location of container attach sockets.
Expand Down
9 changes: 1 addition & 8 deletions src/utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,10 @@ void set_conmon_logs(char *level_name, char *cid_, gboolean syslog_, char *tag)
nexitf("No such log level %s", level_name);
}

#ifdef __FreeBSD__
static bool retryable_error(int err)
{
return err == EINTR || err == EAGAIN;
return err == EINTR || err == EAGAIN || err == ENOBUFS;
}
#else
static bool retryable_error(int err)
{
return err == EINTR;
}
#endif

static void get_signal_descriptor_mask(sigset_t *set)
{
Expand Down
Loading