Keep admin script in sync with init script

[ellert]

Even though there is a comment in the admin script that says:

Keep in sync with init script

the admin script is not in sync with the init script.
This commit corrects this.

The admin script ignored the GLOBUS_SEG_PIDFMT setting in the
sysconfig file that the init script uses. With the default value they
still did the same, and there is usually no need to change the
default, so it usually worked anyway.

[matyasselmeci]

Doesn't this now ignore GLOBUS_SEG_PIDDIR? Is that set anywhere?

[ellert]

Doesn't this now ignore GLOBUS_SEG_PIDDIR? Is that set anywhere?

This is the only place GLOBUS_SEG_PIDDIR is mentioned in the entire source tree.
It is not set in the default version of the sysconfig file, which does set GLOBUS_SEG_PIDFMT.

gct/gram/jobmanager/scheduler_event_generator/source/config/globus-scheduler-event-generator.in

Line 1 in 6259fe3

GLOBUS_SEG_PIDFMT="${localstatedir}/run/globus-scheduler-event-generator-%s.pid"

It is possible to set GLOBUS_SEG_PIDDIR by adding it to the sysconfig file. However, if that is done this setting is ignored by the init script which only supports GLOBUS_SEG_PIDFMT.

gct/gram/jobmanager/scheduler_event_generator/source/init/globus-scheduler-event-generator-lsb.in

Line 73 in 6259fe3

GLOBUS_SEG_PIDFMT="${GLOBUS_SEG_PIDFMT:-${localstatedir}/run/globus-scheduler-event-generator-%s.pid}"

Similarly, changing the default values of GLOBUS_SEG_PIDFMT specified in the sysconfig file will cause a change in where the init script says that the pid file is, but will be ignored by the admin script.
With this proposed change, both the init script and the admin script will recognise the GLOBUS_SEG_PIDFMT variable, which is the one that is mentioned in the default sysconfig file. (And both will ignore GLOBUS_SEG_PIDDIR.)

[matyasselmeci]

OK, looks good.