[CRIU] [PATCH] service: add default pidfile name

[Pavel Emelyanov]

On 02/06/2014 04:04 PM, Ruslan Kuprieiev wrote:
> On 06.02.2014 15:04, Pavel Emelyanov wrote:
>> On 02/05/2014 07:26 PM, Ruslan Kuprieiev wrote:
>>> It is right for deamon to store pidfile at /var/run/ by default.
>> In case daemon generates pid-file himself, he should be responsible
>> for removing it at the end.
> 
> I see. So, maybe, service should remove criu_service.socket too?

Socket is (slightly) different. If it's there, nothing bad happens.
Connect would just get refused. If pidfile is alive, but the service
is not, we may get into trouble.

>>
>>> Signed-off-by: Ruslan Kuprieiev <kupruser at gmail.com>
>>> ---
>>>   cr-service.c               | 3 +++
>>>   include/cr-service-const.h | 1 +
>>>   2 files changed, 4 insertions(+)
>>>
>>> diff --git a/cr-service.c b/cr-service.c
>>> index 5f7f712..1f73101 100644
>>> --- a/cr-service.c
>>> +++ b/cr-service.c
>>> @@ -590,6 +590,9 @@ int cr_service(bool daemon_mode)
>>>   			pr_perror("Can't run service server in the background");
>>>   			goto err;
>>>   		}
>>> +
>>> +		if (!opts.pidfile)
>>> +			opts.pidfile = CR_DEFAULT_SERVICE_PIDFILE;
>>>   	}
>>>   
>>>   	if (opts.pidfile) {
>>> diff --git a/include/cr-service-const.h b/include/cr-service-const.h
>>> index 668882b..dbeb8d0 100644
>>> --- a/include/cr-service-const.h
>>> +++ b/include/cr-service-const.h
>>> @@ -3,5 +3,6 @@
>>>   
>>>   #define CR_MAX_MSG_SIZE 1024
>>>   #define CR_DEFAULT_SERVICE_ADDRESS "/var/run/criu_service.socket"
>>> +#define CR_DEFAULT_SERVICE_PIDFILE "/var/run/criu_service.pid"
>>>   
>>>   #endif /* __CR_SERVICE_CONST_H__ */
>>>
>>
> 
> .
>