Skip to content

Fix #369 relative command path #508

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix #369 relative command path #508

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion supervisor/process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,11 @@ def get_execv_args(self):
raise BadCommand("command is empty")

if "/" in program:
filename = program
if program.startswith('/'):
filename = program
else:
filename = os.path.join(self.config.directory, program)
Copy link

Choose a reason for hiding this comment

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

If the documentation says If it is relative, the supervisord’s environment $PATH will be searched for the executable., but this code assumes the program is relative to the configuration file directory, which is a very different thing. It introduces new behaviour that does not match the documentation.

Copy link
Author

Choose a reason for hiding this comment

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

Yes, but '/' in program does not mean it IS NOT a relative path(or IS absolute). Only program.startswith('/') means absolute path? If so, this code doesn't not comply with the docs.

Copy link

Choose a reason for hiding this comment

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

Yes, but your change fixes one bug and introduces another. Where in the docs does it say that a program should be found relative to the config file dir?

It seems to me the correct way to fix the issue is to change this line:

         if "/" in program:

To this:

         if program.startswith('/'):

Or, even better:

         if os.path.isabs(program):

Copy link
Author

Choose a reason for hiding this comment

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

This doesn't introduce another bug, for self.config.directory is the directory option in the program's config section, not the config file(supervisord.conf) dir. But isabs can be a better choice when checking absolute path.

Copy link

Choose a reason for hiding this comment

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

Ah, you're right, my bad. Sorry. Indeed self.config.directory is the "directory" program config option, not the directory of the config file. I withdraw my objection!
+1


try:
st = self.config.options.stat(filename)
except OSError:
Expand Down