Hi Jacek,
I can start looking at your changes. How does one install
log package now, is it on some special server?
Cheers,
Andy
Becla, Jacek wrote on 2014-08-05:
> Hi Andy,
>
> That helped, thanks. I am getting close to finishing the migration to
> the new logging, I have a few small issues to resolve that I'm planning
> to run by you tomorrow (eg. puzzling missing symbols from Log.o), and
> things marked with "LOGGING FIXME".
>
> I'm hoping you will review it, if you have time, you might have a look
> how things look like now, it is in branch u/jbecla/DM-207, lot of
> changes (I didn't squash things yet)
>
>
> git diff --stat 325226..c84feb
> core/modules/ccontrol/AsyncQueryManager.cc | 9 +++++-
> core/modules/ccontrol/dispatcher.cc | 20 +++++++++++--
> core/modules/ccontrol/thread.cc | 10 +++----
> core/modules/css/Facade.cc | 120
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
> ---
> core/modules/css/KvInterfaceImplMem.cc | 71
> ++++++++++++++++++++++++++++++++++++++++++++--
> core/modules/css/KvInterfaceImplZoo.cc | 96
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
> core/modules/czar/bin/startCzar.py | 23 ++++++++++++---
> core/modules/czar/lsst/qserv/czar/logger.py | 4 +--
> core/modules/log/Logger.cc | 15 +++++++---
> core/modules/log/Logger.h | 14 +++++++++
> core/modules/log/loggerInterface.cc | 8 ++++--
> core/modules/parser/BoolTermFactory.cc | 11 ++++++++
> core/modules/parser/FromFactory.cc | 35
> ++++++++++++++++++++-- - core/modules/parser/ModFactory.cc |
> 29 ++++++++++++++++++- core/modules/parser/SelectFactory.cc |
> 23 ++++++++++++--- core/modules/parser/ValueExprFactory.cc | 12
> ++++++-- core/modules/parser/ValueFactorFactory.cc | 33
> ++++++++++++++++++---- core/modules/parser/WhereFactory.cc |
> 43 ++++++++++++++++++++++++---- core/modules/parser/dbgParse.cc
> | 29 ++++++++++++++++++- core/modules/qana/AggregatePlugin.cc
> | 13 +++++++-- core/modules/qana/PostPlugin.cc | 4
> +++ core/modules/qana/ScanTablePlugin.cc | 16 +++++++++++
> core/modules/qana/TablePlugin.cc | 33
> +++++++++++++++++++--- core/modules/qana/TableStrategy.cc |
> 25 ++++++++++++++-- core/modules/qdisp/ChunkQuery.cc | 126
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> ++++++-
> core/modules/qdisp/MessageStore.cc | 12 ++++++--
> core/modules/qproc/QuerySession.cc | 60
> ++++++++++++++++++++++++++++++++-------
> core/modules/qproc/TaskMsgFactory2.cc | 28 ++++++++++++------
> core/modules/query/BoolTerm.cc | 5 ++++
> core/modules/query/QueryTemplate.cc | 7 +++++
> core/modules/query/SelectStmt.cc | 12 +++++++-
> core/modules/rproc/SqlInsertIter.cc | 22 +++++++++++++--
> core/modules/rproc/TableMerger.cc | 64
> +++++++++++++++++++++++++++++++++++++++--
> core/modules/util/MmapFile.cc | 23 +++++++++++++--
> core/modules/util/WorkQueue.cc | 14 +++++++--
> core/modules/xrdc/PacketIter.cc | 4 +++
> core/modules/xrdc/xrdfile.cc | 127
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> ++++----
> site_scons/state.py | 7 ++++-
> 38 files changed, 1098 insertions(+), 109 deletions(-)
>
> Thanks,
> Jacek
>
> On 08/05/2014 05:24 PM, Salnikov, Andrei A. wrote:
>> Hi Jacek,
>>
>> you need to add couple of things to site_scons/state.py in
>> _initVariables() method:
>>
>> - together with bunch of other _DIR variables: PathVariable('LOG_DIR',
>> 'log install dir', os.getenv("LOG_DIR"), PathVariable.PathIsDir)
>>
>> then below that where you see all _INC and _LIB add
>> something like
>>
>> (PathVariable('LOG_INC', 'log include path',
>> os.path.join(env['LOG_DIR'], "include"), PathVariable.PathIsDir)),
>> (PathVariable('LOG_LIB', 'log libraries path',
>> os.path.join(env['LOG_DIR'], "lib"), PathVariable.PathIsDir)),
>>
>> (this is assuming that includes are in $LOG_DIR/include and libs are
>> in $LOG_DIR/lib).
>>
>> The rest should happen automatically.
>>
>> os.getenv("LOG_DIR") above should probably be replaced with
>> some smarter function (like all other functions there) which
>> can work without eups setting $LOG_DIR (or take it from
>> custom.py).
>>
>>
>> Cheers,
>> Andy
>>
>>
>> Jacek Becla wrote on 2014-08-05:
>>> quick question: how do I force qserv to find includes
>>> from the new log package? The includes are correctly
>>> installed in:
>>>
>>> <myStack>/Linux64/log/1.0.0/include/lsst/log/Log.h
>>>
>>> and the log package is correctly setup:
>>>
>>> eups list log
>>> 1.0.0 current setup
>>> but I guess I need to tweak one of our custom SCons scripts.
>>> Any quick hints where to look would be appreciated.
>>>
>>> thanks,
>>> Jacek
>>>
>>>
>>> #######################################################################
>>> # Use REPLY-ALL to reply to list
>>>
>>> To unsubscribe from the QSERV-L list, click the following link:
>>> https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=QSERV-L&A=1
>>
>>
>>
########################################################################
Use REPLY-ALL to reply to list
To unsubscribe from the QSERV-L list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=QSERV-L&A=1
