LGTM (just remove the git '#' commit message that got there by accident)
On Fri, Mar 28, 2014 at 1:40 PM, Klaus Aehlig <[email protected]> wrote: > Non-jobs requesting resources need to identify themselves by a string > describing uniquely what they do. For the time being (while masterd > still exists), these non-jobs are client requests to masterd. Fortunately, > they already have a unique id, the thread name, which is composed of > the description of the task (like "ClientReq") followed by a running > number. > > with '#' will be ignored, and an empty message aborts the commit. # > rebase in progress; onto 8d2896f # You are currently editing a commit > while rebasing branch 'work' on '8d2896f'. # # Changes to be committed: > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > lib/config.py | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/lib/config.py b/lib/config.py > index b385160..f95a4e7 100644 > --- a/lib/config.py > +++ b/lib/config.py > @@ -69,9 +69,12 @@ def GetWConfdContext(ec_id, livelock): > @return: the WConfd context > > """ > - return (ec_id, > - threading.current_thread().ident, > - livelock.lockfile.name) > + if ec_id is None: > + return (threading.current_thread().getName(), > + livelock.lockfile.name) > + else: > + return (ec_id, > + livelock.lockfile.name) > > > def GetConfig(ec_id, livelock, **kwargs): > -- > 1.9.1.423.g4596e3a > >
