Skip to content

GUACAMOLE-2113: Improve warning when WoL is enabled but no MAC address is provided#606

Merged
mike-jumper merged 2 commits intoapache:patchfrom
svkurupath-keeper:guacamole-2113
Aug 4, 2025
Merged

GUACAMOLE-2113: Improve warning when WoL is enabled but no MAC address is provided#606
mike-jumper merged 2 commits intoapache:patchfrom
svkurupath-keeper:guacamole-2113

Conversation

@svkurupath-keeper
Copy link
Contributor

Proposed fix for GUACAMOLE-2113

  • Removed extra comma(,) in guac_user_log function calls so that the full message is logged.
  • Added a comma for clarity with in the log message for RDP.

Results after local testing:

For VNC
guacd[273689]: WARNING: Wake on LAN was requested, but no MAC address was specified.  WoL will not be sent.

For SSH
guacd[299356]: WARNING: WoL was enabled, but no MAC address was provided.  WoL will not be sent.

For Telnet
guacd[298001]: WARNING: Wake on LAN was requested, but no MAC address was specified.  WoL will not be sent.

For RDP
guacd[299506]: WARNING: WoL requested, but no MAC address specified.  WoL will not be sent.

@svkurupath-keeper svkurupath-keeper marked this pull request as draft July 31, 2025 21:51
@svkurupath-keeper svkurupath-keeper changed the title [GUACAMOLE-2113] Improve warning when WoL is enabled but no MAC address is provided GUACAMOLE-2113: Improve warning when WoL is enabled but no MAC address is provided Jul 31, 2025
@svkurupath-keeper svkurupath-keeper marked this pull request as ready for review July 31, 2025 21:55
Copy link
Contributor

@mike-jumper mike-jumper left a comment

Choose a reason for hiding this comment

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

With respect to the changes themselves, LGTM.

A couple things need to be addressed before this is mergeable:

  • As a minor fix/improvement that does not impact documentation, this should be against patch instead of main. (See the documentation covering our branching scheme.)

  • The commit message needs to be formatted to match established formatting (JIRA issue followed by a colon, etc.).

Since each of the messages is being modified as a part of this, these changes could be a good opportunity to make these messages consistent (ie: WoL requested vs. WoL was enabled vs. Wake on LAN was requested vs. ...). I don't think that's deal-breaking, though.

@svkurupath-keeper svkurupath-keeper changed the base branch from main to patch August 1, 2025 21:45
@svkurupath-keeper
Copy link
Contributor Author

With respect to the changes themselves, LGTM.

A couple things need to be addressed before this is mergeable:

  • As a minor fix/improvement that does not impact documentation, this should be against patch instead of main. (See the documentation covering our branching scheme.)
  • The commit message needs to be formatted to match established formatting (JIRA issue followed by a colon, etc.).

Since each of the messages is being modified as a part of this, these changes could be a good opportunity to make these messages consistent (ie: WoL requested vs. WoL was enabled vs. Wake on LAN was requested vs. ...). I don't think that's deal-breaking, though.

Changed the target to apache:patch.
Changed the commit messages to reflect the established style for the project.
With the new changes, the same message will be used for logging each time when a WoL MAC Address is not specified.

@svkurupath-keeper svkurupath-keeper marked this pull request as draft August 1, 2025 22:20
@svkurupath-keeper svkurupath-keeper marked this pull request as ready for review August 1, 2025 22:52
@mike-jumper mike-jumper merged commit 563f576 into apache:patch Aug 4, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants