Skip to content

cupsd.conf: Remove IdleExitTimeout if no ondemand support#1216

Merged
michaelrsweet merged 1 commit intoOpenPrinting:masterfrom
zdohnal:idleexittimout-noondemand
Apr 10, 2025
Merged

cupsd.conf: Remove IdleExitTimeout if no ondemand support#1216
michaelrsweet merged 1 commit intoOpenPrinting:masterfrom
zdohnal:idleexittimout-noondemand

Conversation

@zdohnal
Copy link
Copy Markdown
Member

@zdohnal zdohnal commented Apr 9, 2025

There are distributions using CUPS without ondemand support, where IdleExitTimeout in cupsd.conf causes error in logs...

Related #1215

@zdohnal zdohnal requested a review from michaelrsweet April 9, 2025 08:13
Copy link
Copy Markdown
Member

@michaelrsweet michaelrsweet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment. You might also leave the comment in cupsd.conf.in and set EXIT_TIMEOUT to # IdleExitTimeout support not enabled. so that someone looking at the cupsd.conf file will see that the on-demand code was compiled in...

AS_IF([test "x$withval" = "xno"], [
EXIT_TIMEOUT=0
AS_IF([test x$with_ondemand != xno], [
AC_ARG_WITH([idle_exit_timeout], AS_HELP_STRING([--with-idle-exit-timeout], [set the default value for IdleExitTimeout, default=60]), [
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we need to set EXIT_TIMEOUT to the empty string if --without-ondemand is specified?

Copy link
Copy Markdown
Member Author

@zdohnal zdohnal Apr 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@michaelrsweet I have tested it locally, and --without-ondemand worked as I expected - there was no IdleExitTimeout line in cupsd.conf.

Tbh I would not leave any comment about IdleExitTimeout if ondemand is disabled - IMO person who builds CUPS without ondemand support on purpose won't be interested in a comment about ondemand specific conf directive. If you don't mind, I will only set EXIT_TIMEOUT to empty string, if with_ondemand = no for better code style and if on other archs/OS configure behaves differently.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@michaelrsweet updated, ready for review.

@zdohnal zdohnal force-pushed the idleexittimout-noondemand branch from d008f7b to cfeba38 Compare April 10, 2025 06:12
There are distributions using CUPS without ondemand support, where
IdleExitTimeout in cupsd.conf causes error in logs...

Related OpenPrinting#1215
@zdohnal zdohnal force-pushed the idleexittimout-noondemand branch from e82dd6d to e472e53 Compare April 10, 2025 06:14
@zdohnal zdohnal requested a review from michaelrsweet April 10, 2025 06:14
Copy link
Copy Markdown
Member

@michaelrsweet michaelrsweet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@michaelrsweet michaelrsweet merged commit 6b170f8 into OpenPrinting:master Apr 10, 2025
3 of 6 checks passed
@michaelrsweet michaelrsweet self-assigned this Apr 10, 2025
@michaelrsweet michaelrsweet added documentation Improvements or additions to documentation enhancement New feature or request labels Apr 10, 2025
@michaelrsweet michaelrsweet added this to the v2.5 milestone Apr 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants