tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

updated to the new pikotools api - we have a logger for morm and ezc

Browse Source 
pikotools has now Log and FileLog classes
which are base classes for winix Log and FileLog classes




git-svn-id: svn://ttmath.org/publicrep/winix/branches/0.7.x@1151 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2018-11-23 17:53:43 +00:00
parent 491dd27ebf
commit b90445de4a
35 changed files with 1163 additions and 1364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

429
winixd/core/Makefile.dep
View File

@@ -4,18 +4,18 @@ acceptbaseparser.o: acceptbaseparser.h winixbase.h
acceptbaseparser.o: ../../../winix/winixd/core/config.h
acceptbaseparser.o: ../../../pikotools/space/spaceparser.h
acceptbaseparser.o: ../../../pikotools/space/space.h
acceptbaseparser.o: ../../../pikotools/textstream/types.h log.h textstream.h
acceptbaseparser.o: misc.h item.h ../../../pikotools/space/space.h
acceptbaseparser.o: ../../../pikotools/textstream/types.h log.h
acceptbaseparser.o: logmanipulators.h ../../../pikotools/log/log.h
acceptbaseparser.o: ../../../pikotools/textstream/textstream.h
acceptbaseparser.o: ../../../pikotools/space/space.h
acceptbaseparser.o: ../../../pikotools/date/date.h
acceptbaseparser.o: ../../../pikotools/convert/convert.h
acceptbaseparser.o: ../../../pikotools/convert/inttostr.h
acceptbaseparser.o: ../../../pikotools/convert/strtoint.h
acceptbaseparser.o: ../../../pikotools/convert/text.h requesttypes.h
acceptbaseparser.o: ../../../pikotools/textstream/textstream.h
acceptbaseparser.o: ../../../pikotools/membuffer/membuffer.h
acceptbaseparser.o: ../../../pikotools/textstream/types.h
acceptbaseparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
acceptbaseparser.o: logmanipulators.h filelog.h
acceptbaseparser.o: ../../../pikotools/convert/text.h misc.h item.h
acceptbaseparser.o: requesttypes.h ../../../pikotools/utf8/utf8.h
acceptbaseparser.o: winix_const.h ../../../pikotools/membuffer/membuffer.h
acceptbaseparser.o: ../../../pikotools/textstream/types.h filelog.h
acceptbaseparser.o: ../../../winix/winixd/core/synchro.h
acceptbaseparser.o: ../../../winix/winixd/core/log.h
acceptbaseparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
@@ -32,10 +32,11 @@ app.o: winix_const.h error.h user.h plugindata.h rebus.h winixbase.h
app.o: ../../../winix/winixd/core/config.h
app.o: ../../../pikotools/space/spaceparser.h
app.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h
app.o: log.h textstream.h logmanipulators.h filelog.h
app.o: log.h logmanipulators.h ../../../pikotools/log/log.h filelog.h
app.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
app.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h ipban.h cur.h
app.o: request.h config.h ../../../winix/winixd/templates/htmltextstream.h
app.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h textstream.h
app.o: ipban.h cur.h request.h config.h
app.o: ../../../winix/winixd/templates/htmltextstream.h
app.o: ../../../winix/winixd/core/textstream.h
app.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
app.o: mount.h winixmodel.h ../../../winix/winixd/core/winixbase.h plugin.h
@@ -129,24 +130,24 @@ app.o: ../../../winix/winixd/templates/htmltextstream.h compress.h
app.o: postparser.h httpsimpleparser.h ../../../pikotools/convert/text.h
app.o: cookieparser.h postmultiparser.h acceptencodingparser.h
app.o: acceptbaseparser.h ../../../pikotools/space/jsontospaceparser.h
app.o: winixrequest.h ../../../pikotools/logger/logger.h
app.o: winixrequest.h
basethread.o: basethread.h synchro.h winixmodel.h
basethread.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
basethread.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
basethread.o: ../../../pikotools/space/spaceparser.h
basethread.o: ../../../pikotools/space/space.h
basethread.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
basethread.o: item.h ../../../pikotools/space/space.h
basethread.o: ../../../pikotools/date/date.h
basethread.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
basethread.o: ../../../pikotools/log/log.h
basethread.o: ../../../pikotools/textstream/textstream.h
basethread.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
basethread.o: ../../../pikotools/convert/convert.h
basethread.o: ../../../pikotools/convert/inttostr.h
basethread.o: ../../../pikotools/convert/strtoint.h
basethread.o: ../../../pikotools/convert/text.h requesttypes.h
basethread.o: ../../../pikotools/textstream/textstream.h
basethread.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
basethread.o: ../../../pikotools/utf8/utf8.h winix_const.h
basethread.o: ../../../pikotools/membuffer/membuffer.h
basethread.o: ../../../pikotools/textstream/types.h
basethread.o: ../../../pikotools/utf8/utf8.h winix_const.h logmanipulators.h
basethread.o: filelog.h ../../../winix/winixd/core/synchro.h
basethread.o: ../../../pikotools/textstream/types.h filelog.h
basethread.o: ../../../winix/winixd/core/synchro.h
basethread.o: ../../../winix/winixd/core/log.h
basethread.o: ../../../winix/winixd/core/filelog.h lock.h
bbcodeparser.o: bbcodeparser.h htmlfilter.h
@@ -164,22 +165,23 @@ compress.o: ../../../pikotools/textstream/types.h winixbase.h
compress.o: ../../../winix/winixd/core/config.h
compress.o: ../../../pikotools/space/spaceparser.h
compress.o: ../../../pikotools/space/space.h
compress.o: ../../../pikotools/textstream/types.h log.h textstream.h
compress.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
compress.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
compress.o: ../../../pikotools/log/log.h filelog.h
compress.o: ../../../winix/winixd/core/synchro.h
compress.o: ../../../winix/winixd/core/log.h
compress.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
config.o: config.h log.h textstream.h misc.h item.h
config.o: config.h log.h logmanipulators.h ../../../pikotools/log/log.h
config.o: ../../../pikotools/textstream/textstream.h
config.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
config.o: ../../../pikotools/convert/convert.h
config.o: ../../../pikotools/convert/inttostr.h
config.o: ../../../pikotools/convert/strtoint.h
config.o: ../../../pikotools/convert/text.h requesttypes.h
config.o: ../../../pikotools/textstream/textstream.h
config.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
config.o: ../../../pikotools/utf8/utf8.h winix_const.h
config.o: ../../../pikotools/membuffer/membuffer.h
config.o: ../../../pikotools/textstream/types.h
config.o: ../../../pikotools/utf8/utf8.h winix_const.h logmanipulators.h
config.o: filelog.h ../../../winix/winixd/core/synchro.h crypt.h run.h
config.o: winixbase.h ../../../winix/winixd/core/config.h
config.o: ../../../pikotools/textstream/types.h filelog.h
config.o: ../../../winix/winixd/core/synchro.h crypt.h run.h winixbase.h
config.o: ../../../winix/winixd/core/config.h
config.o: ../../../pikotools/space/spaceparser.h
config.o: ../../../pikotools/space/space.h
config.o: ../../../pikotools/textstream/types.h
@@ -188,16 +190,17 @@ config.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h user.h
crypt.o: crypt.h run.h winixbase.h ../../../winix/winixd/core/config.h
crypt.o: ../../../pikotools/space/spaceparser.h
crypt.o: ../../../pikotools/space/space.h
crypt.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
crypt.o: item.h ../../../pikotools/space/space.h
crypt.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
crypt.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
crypt.o: ../../../pikotools/log/log.h
crypt.o: ../../../pikotools/textstream/textstream.h
crypt.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
crypt.o: ../../../pikotools/convert/convert.h
crypt.o: ../../../pikotools/convert/inttostr.h
crypt.o: ../../../pikotools/convert/strtoint.h
crypt.o: ../../../pikotools/convert/text.h requesttypes.h
crypt.o: ../../../pikotools/textstream/textstream.h
crypt.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
crypt.o: ../../../pikotools/utf8/utf8.h winix_const.h
crypt.o: ../../../pikotools/membuffer/membuffer.h
crypt.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
crypt.o: winix_const.h logmanipulators.h filelog.h
crypt.o: ../../../pikotools/textstream/types.h filelog.h
crypt.o: ../../../winix/winixd/core/synchro.h
crypt.o: ../../../winix/winixd/core/log.h
crypt.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h config.h
@@ -215,8 +218,8 @@ dircontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h winixbase.h
dircontainer.o: ../../../winix/winixd/core/config.h
dircontainer.o: ../../../pikotools/space/spaceparser.h
dircontainer.o: ../../../pikotools/space/space.h
dircontainer.o: ../../../pikotools/textstream/types.h log.h textstream.h
dircontainer.o: logmanipulators.h filelog.h
dircontainer.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
dircontainer.o: ../../../pikotools/log/log.h filelog.h
dircontainer.o: ../../../winix/winixd/core/synchro.h
dircontainer.o: ../../../winix/winixd/core/log.h
dircontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
@@ -232,11 +235,12 @@ dirs.o: winix_const.h dircontainer.h winixbase.h
dirs.o: ../../../winix/winixd/core/config.h
dirs.o: ../../../pikotools/space/spaceparser.h
dirs.o: ../../../pikotools/space/space.h
dirs.o: ../../../pikotools/textstream/types.h log.h textstream.h
dirs.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
dirs.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
dirs.o: lock.h synchro.h ../../../winix/winixd/db/db.h
dirs.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h
dirs.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
dirs.o: ../../../pikotools/log/log.h filelog.h
dirs.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
dirs.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
dirs.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
dirs.o: ../../../winix/winixd/db/dbconn.h
dirs.o: ../../../winix/winixd/db/dbtextstream.h
dirs.o: ../../../winix/winixd/core/textstream.h
dirs.o: ../../../winix/winixd/core/winixbase.h
@@ -247,7 +251,7 @@ dirs.o: ../../../winix/winixd/db/dbitemcolumns.h
dirs.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h
dirs.o: ../../../winix/winixd/core/dircontainer.h
dirs.o: ../../../winix/winixd/core/ugcontainer.h request.h error.h config.h
dirs.o: ../../../winix/winixd/templates/htmltextstream.h
dirs.o: textstream.h ../../../winix/winixd/templates/htmltextstream.h
dirs.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
dirs.o: winixmodel.h plugin.h pluginmsg.h plugindata.h
dirs.o: ../../../winix/winixd/notify/notify.h
@@ -266,17 +270,17 @@ dirs.o: ../../../winix/winixd/core/basethread.h
dirs.o: ../../../winix/winixd/notify/templatesnotify.h
dirs.o: ../../../winix/winixd/core/users.h
dirs.o: ../../../winix/winixd/core/winixmodel.h
filelog.o: filelog.h textstream.h misc.h item.h
filelog.o: filelog.h ../../../winix/winixd/core/synchro.h
filelog.o: ../../../pikotools/log/log.h
filelog.o: ../../../pikotools/textstream/textstream.h
filelog.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
filelog.o: ../../../pikotools/convert/convert.h
filelog.o: ../../../pikotools/convert/inttostr.h
filelog.o: ../../../pikotools/convert/strtoint.h
filelog.o: ../../../pikotools/convert/text.h requesttypes.h
filelog.o: ../../../pikotools/textstream/textstream.h
filelog.o: ../../../pikotools/membuffer/membuffer.h
filelog.o: ../../../pikotools/textstream/types.h
filelog.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
filelog.o: ../../../pikotools/utf8/utf8.h winix_const.h
filelog.o: ../../../winix/winixd/core/synchro.h timezones.h timezone.h
filelog.o: ../../../pikotools/membuffer/membuffer.h
filelog.o: ../../../pikotools/textstream/types.h timezones.h timezone.h
filelog.o: ../../../pikotools/space/spaceparser.h
filelog.o: ../../../pikotools/space/space.h
filelog.o: ../../../pikotools/textstream/types.h winixbase.h
@@ -308,8 +312,9 @@ groups.o: ../../../winix/winixd/core/user.h
groups.o: ../../../winix/winixd/core/group.h
groups.o: ../../../winix/winixd/core/dircontainer.h
groups.o: ../../../winix/winixd/core/ugcontainer.h winixbase.h
groups.o: ../../../winix/winixd/core/config.h log.h textstream.h
groups.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
groups.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h
groups.o: ../../../pikotools/log/log.h filelog.h
groups.o: ../../../winix/winixd/core/synchro.h
groups.o: ../../../winix/winixd/core/log.h
groups.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h winixmodel.h
groups.o: plugin.h pluginmsg.h plugindata.h
@@ -320,18 +325,18 @@ httpsimpleparser.o: pluginmsg.h plugindata.h winixbase.h
httpsimpleparser.o: ../../../winix/winixd/core/config.h
httpsimpleparser.o: ../../../pikotools/space/spaceparser.h
httpsimpleparser.o: ../../../pikotools/space/space.h
httpsimpleparser.o: ../../../pikotools/textstream/types.h log.h textstream.h
httpsimpleparser.o: misc.h item.h ../../../pikotools/space/space.h
httpsimpleparser.o: ../../../pikotools/textstream/types.h log.h
httpsimpleparser.o: logmanipulators.h ../../../pikotools/log/log.h
httpsimpleparser.o: ../../../pikotools/textstream/textstream.h
httpsimpleparser.o: ../../../pikotools/space/space.h
httpsimpleparser.o: ../../../pikotools/date/date.h
httpsimpleparser.o: ../../../pikotools/convert/convert.h
httpsimpleparser.o: ../../../pikotools/convert/inttostr.h
httpsimpleparser.o: ../../../pikotools/convert/strtoint.h
httpsimpleparser.o: ../../../pikotools/convert/text.h requesttypes.h
httpsimpleparser.o: ../../../pikotools/textstream/textstream.h
httpsimpleparser.o: ../../../pikotools/membuffer/membuffer.h
httpsimpleparser.o: ../../../pikotools/textstream/types.h
httpsimpleparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
httpsimpleparser.o: logmanipulators.h filelog.h
httpsimpleparser.o: ../../../pikotools/convert/text.h misc.h item.h
httpsimpleparser.o: requesttypes.h ../../../pikotools/utf8/utf8.h
httpsimpleparser.o: winix_const.h ../../../pikotools/membuffer/membuffer.h
httpsimpleparser.o: ../../../pikotools/textstream/types.h filelog.h
httpsimpleparser.o: ../../../winix/winixd/core/synchro.h
httpsimpleparser.o: ../../../winix/winixd/core/log.h
httpsimpleparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
@@ -340,19 +345,20 @@ image.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
image.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
image.o: ../../../pikotools/space/spaceparser.h
image.o: ../../../pikotools/space/space.h
image.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
image.o: item.h ../../../pikotools/space/space.h
image.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
image.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
image.o: ../../../pikotools/log/log.h
image.o: ../../../pikotools/textstream/textstream.h
image.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
image.o: ../../../pikotools/convert/convert.h
image.o: ../../../pikotools/convert/inttostr.h
image.o: ../../../pikotools/convert/strtoint.h
image.o: ../../../pikotools/convert/text.h requesttypes.h
image.o: ../../../pikotools/textstream/textstream.h
image.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
image.o: ../../../pikotools/utf8/utf8.h winix_const.h
image.o: ../../../pikotools/membuffer/membuffer.h
image.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
image.o: winix_const.h logmanipulators.h filelog.h
image.o: ../../../pikotools/textstream/types.h filelog.h
image.o: ../../../winix/winixd/core/synchro.h
image.o: ../../../winix/winixd/core/log.h
image.o: ../../../winix/winixd/core/filelog.h lock.h
image.o: ../../../winix/winixd/core/filelog.h lock.h textstream.h
image.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
image.o: ../../../winix/winixd/db/dbconn.h
image.o: ../../../winix/winixd/db/dbtextstream.h
@@ -392,18 +398,18 @@ ipbancontainer.o: plugindata.h winixbase.h
ipbancontainer.o: ../../../winix/winixd/core/config.h
ipbancontainer.o: ../../../pikotools/space/spaceparser.h
ipbancontainer.o: ../../../pikotools/space/space.h
ipbancontainer.o: ../../../pikotools/textstream/types.h log.h textstream.h
ipbancontainer.o: misc.h item.h ../../../pikotools/space/space.h
ipbancontainer.o: ../../../pikotools/textstream/types.h log.h
ipbancontainer.o: logmanipulators.h ../../../pikotools/log/log.h
ipbancontainer.o: ../../../pikotools/textstream/textstream.h
ipbancontainer.o: ../../../pikotools/space/space.h
ipbancontainer.o: ../../../pikotools/date/date.h
ipbancontainer.o: ../../../pikotools/convert/convert.h
ipbancontainer.o: ../../../pikotools/convert/inttostr.h
ipbancontainer.o: ../../../pikotools/convert/strtoint.h
ipbancontainer.o: ../../../pikotools/convert/text.h requesttypes.h
ipbancontainer.o: ../../../pikotools/textstream/textstream.h
ipbancontainer.o: ../../../pikotools/convert/text.h misc.h item.h
ipbancontainer.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h
ipbancontainer.o: ../../../pikotools/membuffer/membuffer.h
ipbancontainer.o: ../../../pikotools/textstream/types.h
ipbancontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h
ipbancontainer.o: logmanipulators.h filelog.h
ipbancontainer.o: ../../../pikotools/textstream/types.h filelog.h
ipbancontainer.o: ../../../winix/winixd/core/synchro.h
ipbancontainer.o: ../../../winix/winixd/core/log.h
ipbancontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
@@ -419,24 +425,25 @@ item.o: winix_const.h crypt.h run.h winixbase.h
item.o: ../../../winix/winixd/core/config.h
item.o: ../../../pikotools/space/spaceparser.h
item.o: ../../../pikotools/space/space.h
item.o: ../../../pikotools/textstream/types.h log.h textstream.h
item.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
item.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
item.o: lock.h synchro.h config.h user.h
item.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
item.o: ../../../pikotools/log/log.h filelog.h
item.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
item.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h config.h user.h
job.o: job.h basethread.h synchro.h winixmodel.h
job.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
job.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
job.o: ../../../pikotools/space/spaceparser.h
job.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h
job.o: log.h textstream.h misc.h item.h ../../../pikotools/space/space.h
job.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
job.o: log.h logmanipulators.h ../../../pikotools/log/log.h
job.o: ../../../pikotools/textstream/textstream.h
job.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
job.o: ../../../pikotools/convert/convert.h
job.o: ../../../pikotools/convert/inttostr.h
job.o: ../../../pikotools/convert/strtoint.h
job.o: ../../../pikotools/convert/text.h requesttypes.h
job.o: ../../../pikotools/textstream/textstream.h
job.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
job.o: ../../../pikotools/utf8/utf8.h winix_const.h
job.o: ../../../pikotools/membuffer/membuffer.h
job.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
job.o: winix_const.h logmanipulators.h filelog.h
job.o: ../../../pikotools/textstream/types.h filelog.h
job.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
job.o: ../../../winix/winixd/core/filelog.h lock.h
lastcontainer.o: lastcontainer.h ../../../pikotools/date/date.h
@@ -452,38 +459,39 @@ lastcontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h winixbase.h
lastcontainer.o: ../../../winix/winixd/core/config.h
lastcontainer.o: ../../../pikotools/space/spaceparser.h
lastcontainer.o: ../../../pikotools/space/space.h
lastcontainer.o: ../../../pikotools/textstream/types.h log.h textstream.h
lastcontainer.o: logmanipulators.h filelog.h
lastcontainer.o: ../../../pikotools/textstream/types.h log.h
lastcontainer.o: logmanipulators.h ../../../pikotools/log/log.h filelog.h
lastcontainer.o: ../../../winix/winixd/core/synchro.h
lastcontainer.o: ../../../winix/winixd/core/log.h
lastcontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
loadavg.o: loadavg.h winixbase.h ../../../winix/winixd/core/config.h
loadavg.o: ../../../pikotools/space/spaceparser.h
loadavg.o: ../../../pikotools/space/space.h
loadavg.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
loadavg.o: item.h ../../../pikotools/space/space.h
loadavg.o: ../../../pikotools/date/date.h
loadavg.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
loadavg.o: ../../../pikotools/log/log.h
loadavg.o: ../../../pikotools/textstream/textstream.h
loadavg.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
loadavg.o: ../../../pikotools/convert/convert.h
loadavg.o: ../../../pikotools/convert/inttostr.h
loadavg.o: ../../../pikotools/convert/strtoint.h
loadavg.o: ../../../pikotools/convert/text.h requesttypes.h
loadavg.o: ../../../pikotools/textstream/textstream.h
loadavg.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
loadavg.o: ../../../pikotools/utf8/utf8.h winix_const.h
loadavg.o: ../../../pikotools/membuffer/membuffer.h
loadavg.o: ../../../pikotools/textstream/types.h
loadavg.o: ../../../pikotools/utf8/utf8.h winix_const.h logmanipulators.h
loadavg.o: filelog.h ../../../winix/winixd/core/synchro.h
loadavg.o: ../../../pikotools/textstream/types.h filelog.h
loadavg.o: ../../../winix/winixd/core/synchro.h
loadavg.o: ../../../winix/winixd/core/log.h
loadavg.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
lock.o: lock.h synchro.h
log.o: log.h textstream.h misc.h item.h ../../../pikotools/space/space.h
log.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
log.o: log.h logmanipulators.h ../../../pikotools/log/log.h
log.o: ../../../pikotools/textstream/textstream.h
log.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
log.o: ../../../pikotools/convert/convert.h
log.o: ../../../pikotools/convert/inttostr.h
log.o: ../../../pikotools/convert/strtoint.h
log.o: ../../../pikotools/convert/text.h requesttypes.h
log.o: ../../../pikotools/textstream/textstream.h
log.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
log.o: ../../../pikotools/utf8/utf8.h winix_const.h
log.o: ../../../pikotools/membuffer/membuffer.h
log.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
log.o: winix_const.h logmanipulators.h filelog.h
log.o: ../../../pikotools/textstream/types.h filelog.h
log.o: ../../../winix/winixd/core/synchro.h
misc.o: misc.h item.h ../../../pikotools/space/space.h
misc.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
@@ -499,7 +507,8 @@ misc.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
misc.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
misc.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
misc.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h
misc.o: ../../../ezc/src/patternparser.h
misc.o: ../../../ezc/src/patternparser.h ../../../pikotools/log/log.h
misc.o: filelog.h ../../../winix/winixd/core/synchro.h
misc.o: ../../../winix/winixd/templates/patterncacher.h
misc.o: ../../../winix/winixd/core/item.h
misc.o: ../../../winix/winixd/core/winixbase.h
@@ -512,8 +521,7 @@ misc.o: ../../../winix/winixd/templates/localefilter.h
misc.o: ../../../winix/winixd/core/config.h
misc.o: ../../../pikotools/space/spaceparser.h
misc.o: ../../../pikotools/space/space.h
misc.o: ../../../pikotools/textstream/types.h log.h textstream.h
misc.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
misc.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
misc.o: ../../../winix/winixd/core/cur.h ../../../winix/winixd/core/system.h
misc.o: ../../../winix/winixd/core/sessionmanager.h
misc.o: ../../../winix/winixd/core/htmlfilter.h ../../../winix/winixd/db/db.h
@@ -531,7 +539,7 @@ misc.o: lock.h synchro.h ../../../winix/winixd/core/winixrequest.h
misc.o: ../../../winix/winixd/core/winixsystem.h
misc.o: ../../../winix/winixd/core/winixmodel.h
misc.o: ../../../winix/winixd/core/slog.h cur.h request.h error.h config.h
misc.o: ../../../winix/winixd/templates/htmltextstream.h
misc.o: textstream.h ../../../winix/winixd/templates/htmltextstream.h
misc.o: ../../../pikotools/space/spacetojson.h session.h user.h plugindata.h
misc.o: rebus.h ipban.h mount.h ../../../winix/winixd/templates/locale.h
mount.o: mount.h misc.h item.h ../../../pikotools/space/space.h
@@ -556,8 +564,8 @@ mountparser.o: ../../../pikotools/utf8/utf8.h winix_const.h dirs.h
mountparser.o: dircontainer.h winixbase.h ../../../winix/winixd/core/config.h
mountparser.o: ../../../pikotools/space/spaceparser.h
mountparser.o: ../../../pikotools/space/space.h
mountparser.o: ../../../pikotools/textstream/types.h log.h textstream.h
mountparser.o: logmanipulators.h filelog.h
mountparser.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
mountparser.o: ../../../pikotools/log/log.h filelog.h
mountparser.o: ../../../winix/winixd/core/synchro.h
mountparser.o: ../../../winix/winixd/core/log.h
mountparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
@@ -575,7 +583,8 @@ mountparser.o: ../../../winix/winixd/core/user.h
mountparser.o: ../../../winix/winixd/core/group.h
mountparser.o: ../../../winix/winixd/core/dircontainer.h
mountparser.o: ../../../winix/winixd/core/ugcontainer.h request.h error.h
mountparser.o: config.h ../../../winix/winixd/templates/htmltextstream.h
mountparser.o: config.h textstream.h
mountparser.o: ../../../winix/winixd/templates/htmltextstream.h
mountparser.o: ../../../pikotools/space/spacetojson.h
mountparser.o: ../../../ezc/src/outstreams.h winixmodel.h plugin.h
mountparser.o: pluginmsg.h plugindata.h
@@ -592,8 +601,9 @@ mounts.o: ../../../pikotools/utf8/utf8.h winix_const.h dircontainer.h
mounts.o: winixbase.h ../../../winix/winixd/core/config.h
mounts.o: ../../../pikotools/space/spaceparser.h
mounts.o: ../../../pikotools/space/space.h
mounts.o: ../../../pikotools/textstream/types.h log.h textstream.h
mounts.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
mounts.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
mounts.o: ../../../pikotools/log/log.h filelog.h
mounts.o: ../../../winix/winixd/core/synchro.h
mounts.o: ../../../winix/winixd/core/log.h
mounts.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
mounts.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -609,7 +619,7 @@ mounts.o: ../../../winix/winixd/core/user.h
mounts.o: ../../../winix/winixd/core/group.h
mounts.o: ../../../winix/winixd/core/dircontainer.h
mounts.o: ../../../winix/winixd/core/ugcontainer.h request.h config.h
mounts.o: ../../../winix/winixd/templates/htmltextstream.h
mounts.o: textstream.h ../../../winix/winixd/templates/htmltextstream.h
mounts.o: ../../../pikotools/space/spacetojson.h
mounts.o: ../../../ezc/src/outstreams.h winixmodel.h plugin.h pluginmsg.h
mounts.o: plugindata.h mountparser.h cur.h session.h user.h rebus.h ipban.h
@@ -617,17 +627,18 @@ plugin.o: plugin.h pluginmsg.h plugindata.h winixbase.h
plugin.o: ../../../winix/winixd/core/config.h
plugin.o: ../../../pikotools/space/spaceparser.h
plugin.o: ../../../pikotools/space/space.h
plugin.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
plugin.o: item.h ../../../pikotools/space/space.h
plugin.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
plugin.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
plugin.o: ../../../pikotools/log/log.h
plugin.o: ../../../pikotools/textstream/textstream.h
plugin.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
plugin.o: ../../../pikotools/convert/convert.h
plugin.o: ../../../pikotools/convert/inttostr.h
plugin.o: ../../../pikotools/convert/strtoint.h
plugin.o: ../../../pikotools/convert/text.h requesttypes.h
plugin.o: ../../../pikotools/textstream/textstream.h
plugin.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
plugin.o: ../../../pikotools/utf8/utf8.h winix_const.h
plugin.o: ../../../pikotools/membuffer/membuffer.h
plugin.o: ../../../pikotools/textstream/types.h
plugin.o: ../../../pikotools/utf8/utf8.h winix_const.h logmanipulators.h
plugin.o: filelog.h ../../../winix/winixd/core/synchro.h
plugin.o: ../../../pikotools/textstream/types.h filelog.h
plugin.o: ../../../winix/winixd/core/synchro.h
plugin.o: ../../../winix/winixd/core/log.h
plugin.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h system.h
plugin.o: job.h basethread.h winixmodel.h
@@ -644,7 +655,7 @@ plugin.o: ../../../winix/winixd/core/user.h
plugin.o: ../../../winix/winixd/core/group.h
plugin.o: ../../../winix/winixd/core/dircontainer.h
plugin.o: ../../../winix/winixd/core/ugcontainer.h request.h error.h config.h
plugin.o: ../../../winix/winixd/templates/htmltextstream.h
plugin.o: textstream.h ../../../winix/winixd/templates/htmltextstream.h
plugin.o: ../../../pikotools/space/spacetojson.h
plugin.o: ../../../ezc/src/outstreams.h mounts.h mount.h mountparser.h
plugin.o: crypt.h run.h user.h users.h ugcontainer.h lastcontainer.h cur.h
@@ -730,18 +741,18 @@ plugindata.o: plugindata.h plugin.h pluginmsg.h winixbase.h
plugindata.o: ../../../winix/winixd/core/config.h
plugindata.o: ../../../pikotools/space/spaceparser.h
plugindata.o: ../../../pikotools/space/space.h
plugindata.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
plugindata.o: item.h ../../../pikotools/space/space.h
plugindata.o: ../../../pikotools/date/date.h
plugindata.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
plugindata.o: ../../../pikotools/log/log.h
plugindata.o: ../../../pikotools/textstream/textstream.h
plugindata.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
plugindata.o: ../../../pikotools/convert/convert.h
plugindata.o: ../../../pikotools/convert/inttostr.h
plugindata.o: ../../../pikotools/convert/strtoint.h
plugindata.o: ../../../pikotools/convert/text.h requesttypes.h
plugindata.o: ../../../pikotools/textstream/textstream.h
plugindata.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
plugindata.o: ../../../pikotools/utf8/utf8.h winix_const.h
plugindata.o: ../../../pikotools/membuffer/membuffer.h
plugindata.o: ../../../pikotools/textstream/types.h
plugindata.o: ../../../pikotools/utf8/utf8.h winix_const.h logmanipulators.h
plugindata.o: filelog.h ../../../winix/winixd/core/synchro.h
plugindata.o: ../../../pikotools/textstream/types.h filelog.h
plugindata.o: ../../../winix/winixd/core/synchro.h
plugindata.o: ../../../winix/winixd/core/log.h
plugindata.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
postmultiparser.o: postmultiparser.h error.h requesttypes.h
@@ -758,21 +769,22 @@ postmultiparser.o: ../../../pikotools/textstream/types.h config.h winixbase.h
postmultiparser.o: ../../../winix/winixd/core/config.h
postmultiparser.o: ../../../pikotools/space/spaceparser.h
postmultiparser.o: ../../../pikotools/space/space.h
postmultiparser.o: ../../../pikotools/textstream/types.h log.h textstream.h
postmultiparser.o: logmanipulators.h filelog.h
postmultiparser.o: ../../../pikotools/textstream/types.h log.h
postmultiparser.o: logmanipulators.h ../../../pikotools/log/log.h filelog.h
postmultiparser.o: ../../../winix/winixd/core/synchro.h
postmultiparser.o: ../../../winix/winixd/core/log.h
postmultiparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
postmultiparser.o: ../../../pikotools/convert/text.h
rebus.o: log.h textstream.h misc.h item.h ../../../pikotools/space/space.h
rebus.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
rebus.o: log.h logmanipulators.h ../../../pikotools/log/log.h
rebus.o: ../../../pikotools/textstream/textstream.h
rebus.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
rebus.o: ../../../pikotools/convert/convert.h
rebus.o: ../../../pikotools/convert/inttostr.h
rebus.o: ../../../pikotools/convert/strtoint.h
rebus.o: ../../../pikotools/convert/text.h requesttypes.h
rebus.o: ../../../pikotools/textstream/textstream.h
rebus.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
rebus.o: ../../../pikotools/utf8/utf8.h winix_const.h
rebus.o: ../../../pikotools/membuffer/membuffer.h
rebus.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
rebus.o: winix_const.h logmanipulators.h filelog.h
rebus.o: ../../../pikotools/textstream/types.h filelog.h
rebus.o: ../../../winix/winixd/core/synchro.h rebus.h winixbase.h
rebus.o: ../../../winix/winixd/core/config.h
rebus.o: ../../../pikotools/space/spaceparser.h
@@ -780,7 +792,7 @@ rebus.o: ../../../pikotools/space/space.h
rebus.o: ../../../pikotools/textstream/types.h
rebus.o: ../../../winix/winixd/core/log.h
rebus.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h cur.h
rebus.o: request.h error.h config.h
rebus.o: request.h error.h config.h textstream.h
rebus.o: ../../../winix/winixd/templates/htmltextstream.h
rebus.o: ../../../winix/winixd/core/textstream.h
rebus.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
@@ -800,7 +812,8 @@ request.o: ../../../winix/winixd/core/textstream.h
request.o: ../../../pikotools/space/spacetojson.h
request.o: ../../../pikotools/space/space.h
request.o: ../../../pikotools/textstream/types.h
request.o: ../../../ezc/src/outstreams.h log.h logmanipulators.h filelog.h
request.o: ../../../ezc/src/outstreams.h log.h logmanipulators.h
request.o: ../../../pikotools/log/log.h filelog.h
request.o: ../../../winix/winixd/core/synchro.h plugin.h pluginmsg.h
request.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
request.o: ../../../pikotools/space/spaceparser.h
@@ -809,15 +822,16 @@ request.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
run.o: run.h winixbase.h ../../../winix/winixd/core/config.h
run.o: ../../../pikotools/space/spaceparser.h
run.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h
run.o: log.h textstream.h misc.h item.h ../../../pikotools/space/space.h
run.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
run.o: log.h logmanipulators.h ../../../pikotools/log/log.h
run.o: ../../../pikotools/textstream/textstream.h
run.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
run.o: ../../../pikotools/convert/convert.h
run.o: ../../../pikotools/convert/inttostr.h
run.o: ../../../pikotools/convert/strtoint.h
run.o: ../../../pikotools/convert/text.h requesttypes.h
run.o: ../../../pikotools/textstream/textstream.h
run.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
run.o: ../../../pikotools/utf8/utf8.h winix_const.h
run.o: ../../../pikotools/membuffer/membuffer.h
run.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
run.o: winix_const.h logmanipulators.h filelog.h
run.o: ../../../pikotools/textstream/types.h filelog.h
run.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
run.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
session.o: session.h item.h ../../../pikotools/space/space.h
@@ -834,10 +848,12 @@ session.o: plugindata.h rebus.h winixbase.h
session.o: ../../../winix/winixd/core/config.h
session.o: ../../../pikotools/space/spaceparser.h
session.o: ../../../pikotools/space/space.h
session.o: ../../../pikotools/textstream/types.h log.h textstream.h
session.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
session.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
session.o: ../../../pikotools/log/log.h filelog.h
session.o: ../../../winix/winixd/core/synchro.h
session.o: ../../../winix/winixd/core/log.h
session.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h ipban.h
session.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h textstream.h
session.o: ipban.h
sessioncontainer.o: sessioncontainer.h session.h item.h
sessioncontainer.o: ../../../pikotools/space/space.h
sessioncontainer.o: ../../../pikotools/date/date.h
@@ -853,12 +869,12 @@ sessioncontainer.o: user.h plugindata.h rebus.h winixbase.h
sessioncontainer.o: ../../../winix/winixd/core/config.h
sessioncontainer.o: ../../../pikotools/space/spaceparser.h
sessioncontainer.o: ../../../pikotools/space/space.h
sessioncontainer.o: ../../../pikotools/textstream/types.h log.h textstream.h
sessioncontainer.o: logmanipulators.h filelog.h
sessioncontainer.o: ../../../pikotools/textstream/types.h log.h
sessioncontainer.o: logmanipulators.h ../../../pikotools/log/log.h filelog.h
sessioncontainer.o: ../../../winix/winixd/core/synchro.h
sessioncontainer.o: ../../../winix/winixd/core/log.h
sessioncontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
sessioncontainer.o: ipban.h cur.h request.h config.h
sessioncontainer.o: textstream.h ipban.h cur.h request.h config.h
sessioncontainer.o: ../../../winix/winixd/templates/htmltextstream.h
sessioncontainer.o: ../../../winix/winixd/core/textstream.h
sessioncontainer.o: ../../../pikotools/space/spacetojson.h
@@ -870,17 +886,17 @@ sessionidmanager.o: ../../../pikotools/space/space.h ../../../tito/src/aes.h
sessionidmanager.o: winixbase.h ../../../winix/winixd/core/config.h
sessionidmanager.o: ../../../pikotools/space/spaceparser.h
sessionidmanager.o: ../../../pikotools/space/space.h
sessionidmanager.o: ../../../pikotools/textstream/types.h log.h textstream.h
sessionidmanager.o: misc.h item.h ../../../pikotools/date/date.h
sessionidmanager.o: ../../../pikotools/textstream/types.h log.h
sessionidmanager.o: logmanipulators.h ../../../pikotools/log/log.h
sessionidmanager.o: ../../../pikotools/textstream/textstream.h
sessionidmanager.o: ../../../pikotools/date/date.h
sessionidmanager.o: ../../../pikotools/convert/convert.h
sessionidmanager.o: ../../../pikotools/convert/inttostr.h
sessionidmanager.o: ../../../pikotools/convert/strtoint.h
sessionidmanager.o: ../../../pikotools/convert/text.h requesttypes.h
sessionidmanager.o: ../../../pikotools/textstream/textstream.h
sessionidmanager.o: ../../../pikotools/membuffer/membuffer.h
sessionidmanager.o: ../../../pikotools/textstream/types.h
sessionidmanager.o: ../../../pikotools/utf8/utf8.h winix_const.h
sessionidmanager.o: logmanipulators.h filelog.h
sessionidmanager.o: ../../../pikotools/convert/text.h misc.h item.h
sessionidmanager.o: requesttypes.h ../../../pikotools/utf8/utf8.h
sessionidmanager.o: winix_const.h ../../../pikotools/membuffer/membuffer.h
sessionidmanager.o: ../../../pikotools/textstream/types.h filelog.h
sessionidmanager.o: ../../../winix/winixd/core/synchro.h
sessionidmanager.o: ../../../winix/winixd/core/log.h
sessionidmanager.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
@@ -899,12 +915,12 @@ sessionmanager.o: plugindata.h rebus.h winixbase.h
sessionmanager.o: ../../../winix/winixd/core/config.h
sessionmanager.o: ../../../pikotools/space/spaceparser.h
sessionmanager.o: ../../../pikotools/space/space.h
sessionmanager.o: ../../../pikotools/textstream/types.h log.h textstream.h
sessionmanager.o: logmanipulators.h filelog.h
sessionmanager.o: ../../../pikotools/textstream/types.h log.h
sessionmanager.o: logmanipulators.h ../../../pikotools/log/log.h filelog.h
sessionmanager.o: ../../../winix/winixd/core/synchro.h
sessionmanager.o: ../../../winix/winixd/core/log.h
sessionmanager.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
sessionmanager.o: ipban.h cur.h request.h config.h
sessionmanager.o: textstream.h ipban.h cur.h request.h config.h
sessionmanager.o: ../../../winix/winixd/templates/htmltextstream.h
sessionmanager.o: ../../../winix/winixd/core/textstream.h
sessionmanager.o: ../../../pikotools/space/spacetojson.h
@@ -968,13 +984,13 @@ sessionparser.o: plugindata.h rebus.h winixbase.h
sessionparser.o: ../../../winix/winixd/core/config.h
sessionparser.o: ../../../pikotools/space/spaceparser.h
sessionparser.o: ../../../pikotools/space/space.h
sessionparser.o: ../../../pikotools/textstream/types.h log.h textstream.h
sessionparser.o: logmanipulators.h filelog.h
sessionparser.o: ../../../pikotools/textstream/types.h log.h
sessionparser.o: logmanipulators.h ../../../pikotools/log/log.h filelog.h
sessionparser.o: ../../../winix/winixd/core/synchro.h
sessionparser.o: ../../../winix/winixd/core/log.h
sessionparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
sessionparser.o: ipban.h sessioncontainer.h cur.h request.h config.h
sessionparser.o: ../../../winix/winixd/templates/htmltextstream.h
sessionparser.o: textstream.h ipban.h sessioncontainer.h cur.h request.h
sessionparser.o: config.h ../../../winix/winixd/templates/htmltextstream.h
sessionparser.o: ../../../winix/winixd/core/textstream.h
sessionparser.o: ../../../pikotools/space/spacetojson.h
sessionparser.o: ../../../ezc/src/outstreams.h mount.h winixmodel.h
@@ -1010,9 +1026,9 @@ slog.o: ../../../pikotools/textstream/types.h ../../../ezc/src/outstreams.h
slog.o: session.h user.h plugindata.h rebus.h winixbase.h
slog.o: ../../../winix/winixd/core/config.h
slog.o: ../../../pikotools/space/spaceparser.h log.h logmanipulators.h
slog.o: filelog.h ../../../winix/winixd/core/synchro.h
slog.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
slog.o: lock.h synchro.h ipban.h mount.h
slog.o: ../../../pikotools/log/log.h filelog.h
slog.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
slog.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h ipban.h mount.h
slog.o: ../../../winix/winixd/templates/locale.h
slog.o: ../../../winix/winixd/core/winixbase.h
synchro.o: synchro.h
@@ -1021,17 +1037,18 @@ system.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
system.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
system.o: ../../../pikotools/space/spaceparser.h
system.o: ../../../pikotools/space/space.h
system.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
system.o: item.h ../../../pikotools/space/space.h
system.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
system.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
system.o: ../../../pikotools/log/log.h
system.o: ../../../pikotools/textstream/textstream.h
system.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
system.o: ../../../pikotools/convert/convert.h
system.o: ../../../pikotools/convert/inttostr.h
system.o: ../../../pikotools/convert/strtoint.h
system.o: ../../../pikotools/convert/text.h requesttypes.h
system.o: ../../../pikotools/textstream/textstream.h
system.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
system.o: ../../../pikotools/utf8/utf8.h winix_const.h
system.o: ../../../pikotools/membuffer/membuffer.h
system.o: ../../../pikotools/textstream/types.h
system.o: ../../../pikotools/utf8/utf8.h winix_const.h logmanipulators.h
system.o: filelog.h ../../../winix/winixd/core/synchro.h
system.o: ../../../pikotools/textstream/types.h filelog.h
system.o: ../../../winix/winixd/core/synchro.h
system.o: ../../../winix/winixd/core/log.h
system.o: ../../../winix/winixd/core/filelog.h lock.h dirs.h dircontainer.h
system.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -1046,7 +1063,7 @@ system.o: ../../../winix/winixd/core/user.h
system.o: ../../../winix/winixd/core/group.h
system.o: ../../../winix/winixd/core/dircontainer.h
system.o: ../../../winix/winixd/core/ugcontainer.h request.h error.h config.h
system.o: ../../../winix/winixd/templates/htmltextstream.h
system.o: textstream.h ../../../winix/winixd/templates/htmltextstream.h
system.o: ../../../pikotools/space/spacetojson.h
system.o: ../../../ezc/src/outstreams.h mounts.h mount.h mountparser.h
system.o: crypt.h run.h user.h users.h ugcontainer.h lastcontainer.h cur.h
@@ -1131,18 +1148,18 @@ threadmanager.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
threadmanager.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
threadmanager.o: ../../../pikotools/space/spaceparser.h
threadmanager.o: ../../../pikotools/space/space.h
threadmanager.o: ../../../pikotools/textstream/types.h log.h textstream.h
threadmanager.o: misc.h item.h ../../../pikotools/space/space.h
threadmanager.o: ../../../pikotools/textstream/types.h log.h
threadmanager.o: logmanipulators.h ../../../pikotools/log/log.h
threadmanager.o: ../../../pikotools/textstream/textstream.h
threadmanager.o: ../../../pikotools/space/space.h
threadmanager.o: ../../../pikotools/date/date.h
threadmanager.o: ../../../pikotools/convert/convert.h
threadmanager.o: ../../../pikotools/convert/inttostr.h
threadmanager.o: ../../../pikotools/convert/strtoint.h
threadmanager.o: ../../../pikotools/convert/text.h requesttypes.h
threadmanager.o: ../../../pikotools/textstream/textstream.h
threadmanager.o: ../../../pikotools/convert/text.h misc.h item.h
threadmanager.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h
threadmanager.o: ../../../pikotools/membuffer/membuffer.h
threadmanager.o: ../../../pikotools/textstream/types.h
threadmanager.o: ../../../pikotools/utf8/utf8.h winix_const.h
threadmanager.o: logmanipulators.h filelog.h
threadmanager.o: ../../../pikotools/textstream/types.h filelog.h
threadmanager.o: ../../../winix/winixd/core/synchro.h
threadmanager.o: ../../../winix/winixd/core/log.h
threadmanager.o: ../../../winix/winixd/core/filelog.h lock.h
@@ -1169,8 +1186,9 @@ timezones.o: ../../../pikotools/utf8/utf8.h winix_const.h
timezones.o: ../../../pikotools/space/spaceparser.h
timezones.o: ../../../pikotools/space/space.h
timezones.o: ../../../pikotools/textstream/types.h winixbase.h
timezones.o: ../../../winix/winixd/core/config.h log.h textstream.h
timezones.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
timezones.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h
timezones.o: ../../../pikotools/log/log.h filelog.h
timezones.o: ../../../winix/winixd/core/synchro.h
timezones.o: ../../../winix/winixd/core/log.h
timezones.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
user.o: user.h ../../../pikotools/space/space.h
@@ -1194,11 +1212,12 @@ users.o: winix_const.h ugcontainer.h lastcontainer.h winixbase.h
users.o: ../../../winix/winixd/core/config.h
users.o: ../../../pikotools/space/spaceparser.h
users.o: ../../../pikotools/space/space.h
users.o: ../../../pikotools/textstream/types.h log.h textstream.h
users.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
users.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
users.o: ../../../pikotools/log/log.h filelog.h
users.o: ../../../winix/winixd/core/synchro.h
users.o: ../../../winix/winixd/core/log.h
users.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h cur.h
users.o: request.h error.h config.h
users.o: request.h error.h config.h textstream.h
users.o: ../../../winix/winixd/templates/htmltextstream.h
users.o: ../../../winix/winixd/core/textstream.h
users.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
@@ -1238,18 +1257,18 @@ users.o: ../../../tito/src/aes.h
winixbase.o: winixbase.h ../../../winix/winixd/core/config.h
winixbase.o: ../../../pikotools/space/spaceparser.h
winixbase.o: ../../../pikotools/space/space.h
winixbase.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
winixbase.o: item.h ../../../pikotools/space/space.h
winixbase.o: ../../../pikotools/date/date.h
winixbase.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
winixbase.o: ../../../pikotools/log/log.h
winixbase.o: ../../../pikotools/textstream/textstream.h
winixbase.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
winixbase.o: ../../../pikotools/convert/convert.h
winixbase.o: ../../../pikotools/convert/inttostr.h
winixbase.o: ../../../pikotools/convert/strtoint.h
winixbase.o: ../../../pikotools/convert/text.h requesttypes.h
winixbase.o: ../../../pikotools/textstream/textstream.h
winixbase.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
winixbase.o: ../../../pikotools/utf8/utf8.h winix_const.h
winixbase.o: ../../../pikotools/membuffer/membuffer.h
winixbase.o: ../../../pikotools/textstream/types.h
winixbase.o: ../../../pikotools/utf8/utf8.h winix_const.h logmanipulators.h
winixbase.o: filelog.h ../../../winix/winixd/core/synchro.h
winixbase.o: ../../../pikotools/textstream/types.h filelog.h
winixbase.o: ../../../winix/winixd/core/synchro.h
winixbase.o: ../../../winix/winixd/core/log.h
winixbase.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
winixmodel.o: winixmodel.h ../../../winix/winixd/core/winixbase.h plugin.h
@@ -1257,18 +1276,18 @@ winixmodel.o: pluginmsg.h plugindata.h winixbase.h
winixmodel.o: ../../../winix/winixd/core/config.h
winixmodel.o: ../../../pikotools/space/spaceparser.h
winixmodel.o: ../../../pikotools/space/space.h
winixmodel.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
winixmodel.o: item.h ../../../pikotools/space/space.h
winixmodel.o: ../../../pikotools/date/date.h
winixmodel.o: ../../../pikotools/textstream/types.h log.h logmanipulators.h
winixmodel.o: ../../../pikotools/log/log.h
winixmodel.o: ../../../pikotools/textstream/textstream.h
winixmodel.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
winixmodel.o: ../../../pikotools/convert/convert.h
winixmodel.o: ../../../pikotools/convert/inttostr.h
winixmodel.o: ../../../pikotools/convert/strtoint.h
winixmodel.o: ../../../pikotools/convert/text.h requesttypes.h
winixmodel.o: ../../../pikotools/textstream/textstream.h
winixmodel.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
winixmodel.o: ../../../pikotools/utf8/utf8.h winix_const.h
winixmodel.o: ../../../pikotools/membuffer/membuffer.h
winixmodel.o: ../../../pikotools/textstream/types.h
winixmodel.o: ../../../pikotools/utf8/utf8.h winix_const.h logmanipulators.h
winixmodel.o: filelog.h ../../../winix/winixd/core/synchro.h
winixmodel.o: ../../../pikotools/textstream/types.h filelog.h
winixmodel.o: ../../../winix/winixd/core/synchro.h
winixmodel.o: ../../../winix/winixd/core/log.h
winixmodel.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
winixrequest.o: winixrequest.h

8
winixd/core/app.cpp
View File

@@ -165,7 +165,7 @@ App::App()
void App::InitLoggers()
{
file_log.init(config.log_file, config.log_stdout, config.log_level, config.log_save_each_line, config.log_time_zone_id);
log.Init(config.log_request);
log.SetMaxRequests(config.log_request);
}
@@ -277,11 +277,9 @@ return true;
bool App::Init()
{
// temporarily
logger.init(config.log_level, config.log_save_each_line, L"/var/log/www/db.log", config.log_stdout);
postgresql_connector.set_logger(logger);
postgresql_connector.set_conn_param(config.db_database, config.db_user, config.db_pass);
postgresql_connector.set_logger(log);
postgresql_connector.set_log_queries(config.log_db_query);
postgresql_connector.wait_for_connection();
model_connector.set_flat_connector(json_connector);

5
winixd/core/app.h
View File

@@ -57,7 +57,7 @@
#include "space/jsontospaceparser.h"
#include "winixrequest.h"
#include "logger/logger.h"
#include "log/log.h"
#include "filelog.h"
@@ -166,7 +166,6 @@ private:
std::wstring http_header;
std::string http_header_8bit;
PT::Logger logger; // temporarily
morm::ModelConnector model_connector; // main thread model connector, each thread has its own connector
morm::JSONConnector json_connector;
morm::PostgreSQLConnector postgresql_connector;
@@ -183,7 +182,7 @@ private:
//////////////////////////
// log_buffer for the main thread
TextStream<std::wstring> log_buffer;
PT::WTextStream log_buffer;
// logger only for App object
Log log;

5
winixd/core/config.cpp
View File

@@ -52,13 +52,10 @@ Config::Config()
void Config::SetFileLog(FileLog * file_log)
{
log.SetFileLog(file_log);
// the config is not read yet so we put some constants here
log.Init(1);
}
void Config::SetLogBuffer(TextStream<std::wstring> * log_buffer)
void Config::SetLogBuffer(PT::WTextStream * log_buffer)
{
log.SetLogBuffer(log_buffer);
}

2
winixd/core/config.h
View File

@@ -821,7 +821,7 @@ public:
void SetFileLog(FileLog * file_log);
void SetLogBuffer(TextStream<std::wstring> * log_buffer);
void SetLogBuffer(PT::WTextStream * log_buffer);
private:

3
winixd/core/crypt.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -36,6 +36,7 @@
#include "crypt.h"
#include "utf8/utf8.h"
#include "log.h"
#include "misc.h"

61
winixd/core/filelog.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2018, Tomasz Sowa
* Copyright (c) 2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -47,8 +47,6 @@ namespace Winix
FileLog::FileLog()
{
log_stdout = false;
log_file_open = false;
time_zones = nullptr;
synchro = nullptr;
log_time_zone_id = 0;
@@ -68,13 +66,8 @@ void FileLog::set_synchro(Synchro * synchro)
void FileLog::init(const std::wstring & log_file, bool log_stdout, int log_level, bool save_each_line, size_t log_time_zone_id)
{
this->log_stdout = log_stdout;
PT::FileLog::init(log_file, log_stdout, log_level, save_each_line);
this->log_time_zone_id = log_time_zone_id;
this->log_level = log_level;
this->save_each_line = save_each_line;
PT::WideToUTF8(log_file, this->log_file);
// don't open the file here
// because it would be created with the root as an owner
}
@@ -122,57 +115,15 @@ PT::Date FileLog::get_local_date(const PT::Date & date)
void FileLog::open_file()
bool FileLog::synchro_lock()
{
if( !log_file.empty() )
{
file.open( log_file.c_str(), std::ios_base::out | std::ios_base::app );
log_file_open = true;
}
return synchro->Lock();
}
void FileLog::save_log(TextStream<std::wstring> * buffer)
void FileLog::synchro_unlock()
{
if( buffer->Str().empty() )
return;
if( synchro )
{
synchro->Lock();
}
try
{
if( log_stdout )
PT::WideToUTF8(buffer->Str(), std::cout);
if( log_file.empty() )
return;
if( !log_file_open || !file )
{
file.close();
file.clear();
open_file();
if( !file )
return;
}
PT::WideToUTF8(buffer->Str(), file);
file.flush();
}
catch(...)
{
}
if( synchro )
{
synchro->Unlock();
}
synchro->Unlock();
}

24
winixd/core/filelog.h
View File

@@ -39,8 +39,8 @@
#include <fstream>
#include <iostream>
#include <string>
#include "textstream.h"
#include "core/synchro.h"
#include "log/log.h"
@@ -49,17 +49,16 @@ namespace Winix
class TimeZones;
class FileLog
class FileLog : public PT::FileLog
{
public:
FileLog();
~FileLog();
virtual ~FileLog();
void set_synchro(Synchro * synchro);
void init(const std::wstring & log_file, bool log_stdout, int log_level, bool save_each_line, size_t log_time_zone_id);
void save_log(TextStream<std::wstring> * buffer);
void set_time_zones(TimeZones * time_zones);
PT::Date get_local_date(const PT::Date & date);
@@ -67,17 +66,9 @@ public:
int get_log_level();
bool should_save_each_line();
private:
// file log
std::string log_file;
std::ofstream file;
// logging to stdout
bool log_stdout;
// is the config file already open
bool log_file_open;
protected:
size_t log_time_zone_id;
@@ -85,14 +76,11 @@ private:
Synchro * synchro;
// log lovel from the config file
int log_level;
// whether to save each line (for debug)
bool save_each_line;
virtual bool synchro_lock();
virtual void synchro_unlock();
void open_file();
};

2
winixd/core/loadavg.cpp
View File

@@ -31,9 +31,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
#include "loadavg.h"
#include "misc.h"

314
winixd/core/log.cpp
View File

@@ -46,39 +46,16 @@ namespace Winix
Log::Log()
{
current_level = 100; // nothing to log (call Init() first)
request = 0;
max_requests = 1;
lines = 0;
max_lines = 5000;
file_log = nullptr;
buffer = nullptr;
}
Log::~Log()
{
SaveLogAndClear();
}
void Log::SetLogBuffer(TextStream<std::wstring> * buffer)
{
this->buffer = buffer;
}
void Log::SetFileLog(FileLog * pfile_log)
{
this->file_log = pfile_log;
}
FileLog * Log::GetFileLog()
{
return file_log;
}
void Log::SetDependency(Log * log)
{
@@ -88,34 +65,28 @@ void Log::SetDependency(Log * log)
void Log::Init(int max_requests)
void Log::SetMaxRequests(int max_requests)
{
this->max_requests = max_requests;
this->max_requests = max_requests;
}
void Log::PrintDate(const PT::Date & date)
{
if( file_log )
{
(*this) << file_log->get_local_date(date);
}
FileLog * winix_file_log = dynamic_cast<FileLog*>(file_log);
if( winix_file_log )
(*this) << winix_file_log->get_local_date(date);
else
{
(*this) << date;
}
}
Log & Log::operator<<(const void * s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
@@ -123,23 +94,15 @@ Log & Log::operator<<(const void * s)
Log & Log::operator<<(const char * s)
{
if( current_level <= file_log->get_log_level() && buffer && s )
{
(*buffer) << s;
}
return *this;
PT::Log::operator<<(s);
return *this;
}
Log & Log::operator<<(const std::string & s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
@@ -147,11 +110,7 @@ Log & Log::operator<<(const std::string & s)
Log & Log::operator<<(const std::string * s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << *s;
}
PT::Log::operator<<(s);
return *this;
}
@@ -162,23 +121,15 @@ Log & Log::operator<<(const std::string * s)
Log & Log::operator<<(const wchar_t * s)
{
if( current_level <= file_log->get_log_level() && buffer && s )
{
(*buffer) << s;
}
return *this;
PT::Log::operator<<(s);
return *this;
}
Log & Log::operator<<(const std::wstring & s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
@@ -186,25 +137,15 @@ Log & Log::operator<<(const std::wstring & s)
Log & Log::operator<<(const std::wstring * s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << *s;
}
PT::Log::operator<<(s);
return *this;
}
Log & Log::operator<<(int s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
@@ -212,11 +153,7 @@ Log & Log::operator<<(int s)
Log & Log::operator<<(long s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
@@ -225,33 +162,21 @@ Log & Log::operator<<(long s)
Log & Log::operator<<(char s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
Log & Log::operator<<(wchar_t s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
Log & Log::operator<<(size_t s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
@@ -259,11 +184,7 @@ Log & Log::operator<<(size_t s)
Log & Log::operator<<(double s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
@@ -271,24 +192,16 @@ Log & Log::operator<<(double s)
Log & Log::operator<<(const PT::Space & s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
return *this;
PT::Log::operator<<(s);
return *this;
}
Log & Log::operator<<(const PT::Date & date)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << date;
}
return *this;
PT::Log::operator<<(date);
return *this;
}
@@ -297,42 +210,38 @@ Log & Log::operator<<(LogManipulators m)
{
switch(m)
{
case logend:
if( current_level <= file_log->get_log_level() && buffer )
case LogManipulators::log1:
PT::Log::operator<<(PT::Log::log1);
break;
case LogManipulators::log2:
PT::Log::operator<<(PT::Log::log2);
break;
case LogManipulators::log3:
PT::Log::operator<<(PT::Log::log3);
break;
case LogManipulators::log4:
PT::Log::operator<<(PT::Log::log4);
break;
case LogManipulators::logend:
PT::Log::operator<<(PT::Log::logend);
break;
case LogManipulators::logsave:
PT::Log::operator<<(PT::Log::logsave);
break;
case LogManipulators::logendrequest:
if( ++request >= max_requests )
{
(*buffer) << '\n';
lines += 1;
if( file_log->should_save_each_line() )
SaveLogAndClear();
save_log_and_clear();
request = 0;
}
break;
case logsave:
SaveLogAndClear();
break;
case logendrequest:
if( ++request >= max_requests || lines > max_lines )
SaveLogAndClear();
break;
case log1:
current_level = 1;
break;
case log2:
current_level = 2;
break;
case log3:
current_level = 3;
break;
case log4:
current_level = 4;
break;
default:
break;
}
@@ -341,84 +250,7 @@ return *this;
}
char Log::GetHEXdigit(unsigned char c)
{
if( c < 10 )
return c + '0';
return c - 10 + 'A';
}
void Log::ToHEX(char * buf, unsigned char c)
{
buf[0] = GetHEXdigit(c >> 4);
buf[1] = GetHEXdigit(c & 0xf);
buf[2] = 0;
}
void Log::LogBinary(const char * blob, size_t blob_len)
{
size_t i=0;
char buf[3];
if( !buffer )
return;
while( i < blob_len )
{
size_t oldi = i;
for(size_t a=0 ; a<16 ; ++a)
{
if( i < blob_len )
{
ToHEX(buf, blob[i]);
(*buffer) << buf << ' ';
++i;
}
else
{
(*buffer) << " ";
}
if( a == 7 )
{
if( i < blob_len )
(*buffer) << "- ";
else
(*buffer) << " ";
}
}
i = oldi;
(*buffer) << ' ';
for(size_t a=0 ; a<16 && i<blob_len ; ++a, ++i)
{
if( blob[i] > 31 && blob[i] < 127 )
(*buffer) << blob[i];
else
(*buffer) << '.';
}
(*this) << logend;
}
}
void Log::LogBinary(const std::string & blob)
{
LogBinary(blob.c_str(), blob.size());
}
void Log::SystemErr(int err)
Log & Log::SystemErr(int err)
{
(*this) << "errno: " << err;
@@ -426,29 +258,37 @@ void Log::SystemErr(int err)
if( err_msg )
(*this) << " (" << err_msg << ")";
return *this;
}
void Log::SaveLogAndClear()
Log & Log::LogString(const std::string & value, size_t max_size)
{
SaveLog();
if( buffer )
{
buffer->Clear();
}
request = 0;
lines = 0;
PT::Log::LogString(value, max_size);
return *this;
}
void Log::SaveLog()
Log & Log::LogString(const std::wstring & value, size_t max_size)
{
if( buffer )
{
file_log->save_log(buffer);
}
PT::Log::LogString(value, max_size);
return *this;
}
Log & Log::LogBinary(const char * blob, size_t blob_len)
{
PT::Log::LogBinary(blob, blob_len);
return *this;
}
Log & Log::LogBinary(const std::string & blob)
{
PT::Log::LogBinary(blob);
return *this;
}

109
winixd/core/log.h
View File

@@ -40,10 +40,10 @@
#include <fstream>
#include <iostream>
#include <string>
#include "textstream.h"
#include "logmanipulators.h"
#include "textstream/textstream.h"
#include "filelog.h"
#include "log/log.h"
namespace Winix
@@ -51,67 +51,51 @@ namespace Winix
class Log
class Log : public PT::Log
{
public:
Log();
~Log();
virtual ~Log();
void SetLogBuffer(TextStream<std::wstring> * buffer);
virtual void SetDependency(Log * log);
void SetFileLog(FileLog * file_log);
FileLog * GetFileLog();
virtual void SetMaxRequests(int max_requests);
void SetDependency(Log * log);
virtual Log & operator<<(const void * s);
virtual Log & operator<<(const char * s);
virtual Log & operator<<(const std::string * s);
virtual Log & operator<<(const std::string & s);
virtual Log & operator<<(const wchar_t * s);
virtual Log & operator<<(const std::wstring * s);
virtual Log & operator<<(const std::wstring & s);
virtual Log & operator<<(int s);
virtual Log & operator<<(long s);
virtual Log & operator<<(char s);
virtual Log & operator<<(wchar_t s);
virtual Log & operator<<(size_t s);
virtual Log & operator<<(double s);
virtual Log & operator<<(const PT::Space & space);
virtual Log & operator<<(LogManipulators m);
virtual Log & operator<<(const PT::Date & date);
void Init(int max_requests);
Log & operator<<(const void * s);
Log & operator<<(const char * s);
Log & operator<<(const std::string * s);
Log & operator<<(const std::string & s);
Log & operator<<(const wchar_t * s);
Log & operator<<(const std::wstring * s);
Log & operator<<(const std::wstring & s);
Log & operator<<(int s);
Log & operator<<(long s);
Log & operator<<(char s);
Log & operator<<(wchar_t s);
Log & operator<<(size_t s);
Log & operator<<(double s);
Log & operator<<(const PT::Space & space);
Log & operator<<(LogManipulators m);
Log & operator<<(const PT::Date & date);
void PrintDate(const PT::Date & date);
virtual void PrintDate(const PT::Date & date);
template<typename char_type, size_t stack_size, size_t heap_block_size>
Log & operator<<(const PT::TextStreamBase<char_type, stack_size, heap_block_size> & buf);
template<class StringType>
void LogString(const StringType & value, size_t max_size);
void LogBinary(const char * blob, size_t blob_len);
void LogBinary(const std::string & blob);
void SystemErr(int err);
void SaveLog();
void SaveLogAndClear();
virtual Log & LogString(const std::string & value, size_t max_size);
virtual Log & LogString(const std::wstring & value, size_t max_size);
virtual Log & LogBinary(const char * blob, size_t blob_len);
virtual Log & LogBinary(const std::string & blob);
virtual Log & SystemErr(int err);
private:
// buffer for the log
TextStream<std::wstring> * buffer; // IMPROVE ME this buffer should be a common buffer for all objects for a one thread
// current level set by a modifier (e.g. log << log3)
int current_level;
// current request for logging
// starts from zero and incremented after logendrequest modifier
int request;
@@ -119,51 +103,18 @@ private:
// how many request to save at once
int max_requests;
// IMPROVE ME now we don't know how many lines there are in the buffer as the buffer can be used by other Logs
// how many lines there are in the buffer
int lines;
// how many lines can be in the config buffer
// default: 5000
int max_lines;
FileLog * file_log;
char GetHEXdigit(unsigned char c);
void ToHEX(char * buf, unsigned char c);
};
template<class StringType>
void Log::LogString(const StringType & value, size_t max_size)
{
size_t min_size = value.size() < max_size ? value.size() : max_size;
if( current_level <= file_log->get_log_level() && buffer )
{
for(size_t i=0 ; i<min_size ; ++i)
{
if( value[i] < 32 )
(*buffer) << '.';
else
(*buffer) << value[i];
}
}
}
template<typename char_type, size_t stack_size, size_t heap_block_size>
Log & Log::operator<<(const PT::TextStreamBase<char_type, stack_size, heap_block_size> & buf)
{
if( current_level <= file_log->get_log_level() && buffer )
(*buffer) << buf;
return *this;
PT::Log::operator<<(buf);
return *this;
}

10
winixd/core/logmanipulators.h
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,13 +35,13 @@
#ifndef headerfile_winix_core_logmanipulators
#define headerfile_winix_core_logmanipulators
#include "log/log.h"
namespace Winix
{
/*
log1 - the first level
log2
@@ -65,10 +65,12 @@ enum LogManipulators
log2,
log3,
log4,
logend,
logendrequest,
logsave,
logendrequest,
loginfo,
logerror,
logwarning

1
winixd/core/plugin.cpp
View File

@@ -197,7 +197,6 @@ bool Plugin::SetDependency(PluginInfo & info)
info.plugin = this;
info.log.SetDependency(&log);
log.Init(config->log_request);
return res;
}

2
winixd/core/threadmanager.cpp
View File

@@ -87,6 +87,8 @@ ThreadItem item;
//data.postgresql_connector.set_logger(logger);
data.postgresql_connector.set_conn_param(config->db_database, config->db_user, config->db_pass);
data.postgresql_connector.set_logger(thread_tab.back().object->get_logger());
data.postgresql_connector.set_log_queries(config->log_db_query);
data.postgresql_connector.wait_for_connection();
data.model_connector.set_db_connector(data.postgresql_connector);
data.model_connector.set_flat_connector(data.json_connector);

7
winixd/core/threadmanager.h
View File

@@ -39,6 +39,7 @@
#include <list>
#include "basethread.h"
#include "synchro.h"
#include "textstream/textstream.h"
namespace Winix
@@ -53,9 +54,6 @@ public:
ThreadManager();
// synchro object
//void SetSynchro(Synchro * psynchro);
// initializing
void Init();
@@ -82,7 +80,7 @@ private:
morm::JSONConnector json_connector;
morm::PostgreSQLConnector postgresql_connector;
TextStream<std::wstring> log_buffer;
PT::WTextStream log_buffer;
};
struct ThreadItem
@@ -94,7 +92,6 @@ private:
};
//Synchro * synchro;
typedef std::list<ThreadItem> ThreadTab;
ThreadTab thread_tab;
bool were_started;

8
winixd/core/winixbase.cpp
View File

@@ -63,7 +63,7 @@ void WinixBase::set_synchro(Synchro * synchro)
}
void WinixBase::set_log_buffer(TextStream<std::wstring> * log_buffer)
void WinixBase::set_log_buffer(PT::WTextStream * log_buffer)
{
log.SetLogBuffer(log_buffer);
}
@@ -75,6 +75,12 @@ void WinixBase::set_file_log(FileLog * file_log)
}
Log * WinixBase::get_logger()
{
return &log;
}
void WinixBase::set_dependency(WinixBase * winix_base)
{
config = winix_base->config;

6
winixd/core/winixbase.h
View File

@@ -41,7 +41,7 @@
#include "core/synchro.h"
#include "core/filelog.h"
#include "lock.h"
#include "textstream.h"
#include "textstream/textstream.h"
@@ -58,9 +58,11 @@ public:
void set_config(Config * config);
void set_synchro(Synchro * synchro);
void set_log_buffer(TextStream<std::wstring> * log_buffer);
void set_log_buffer(PT::WTextStream * log_buffer);
void set_file_log(FileLog * file_log);
Log * get_logger();
void set_dependency(WinixBase * winix_base);