sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

s3:script: Replace --merge by --merge-by-timestamp in samba-log-parser

Browse Source 
For --merge-by-timestamp the traces do not need to contain the traceid
header field.

Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

Autobuild-User(master): Pavel Filipensky <pfilipensky@samba.org>
Autobuild-Date(master): Thu Jul 20 19:14:05 UTC 2023 on atb-devel-224
This commit is contained in:
Pavel Filipenský
2023-06-28 14:59:29 +02:00
committed by Pavel Filipensky
parent 16386bfd4c
commit ca5cc05b22
2 changed files with 94 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
docs-xml/manpages/samba-log-parser.1.xml
View File

@ -20,7 +20,7 @@ options:
--traceid ID specify the traceid of the trace records
--pid PID specify the pid of winbind client
--breakdown breakdown the traces into per traceid files
--merge merge logs by timestamp
--merge-by-timestamp merge logs by timestamp
--flow show the request/sub-request flow traces
--flow-compact show the request/sub-request flow traces without dcerpc details
@ -31,7 +31,7 @@ options:
<arg choice="opt">--pid=PID</arg>
<arg choice="opt">--traceid=ID</arg>
<arg choice="opt">--breakdown</arg>
<arg choice="opt">--merge</arg>
<arg choice="opt">--merge-by-timestamp</arg>
<arg choice="opt">--flow</arg>
<arg choice="opt">--flow-compact</arg>
<arg choice="opt">-h|--help</arg>
@ -79,8 +79,9 @@ options:
</varlistentry>
<varlistentry>
<term>--merge</term>
<term>--merge-by-timestamp</term>
<listitem><para>Sort the trace lines according to the timestamp.
Works with log files without traceid header field as well.
</para></listitem>
</varlistentry>
@ -118,7 +119,7 @@ options:
</para>
<programlisting>
# samba-log-parser --pid 999999 --merge /var/log/samba
# samba-log-parser --pid 999999 --merge-by-timestamp /var/log/samba
</programlisting>
<para>Break down the traces into separate files according to traceid sorted
@ -126,7 +127,15 @@ options:
</para>
<programlisting>
# samba-log-parser --breakdown --merge /var/log/samba
# samba-log-parser --breakdown --merge-by-timestamp /var/log/samba
</programlisting>
<para>Sort traces using the timestamp for log files found in the samba log
directory. Traces do not need to contain the traceid header field.
</para>
<programlisting>
# samba-log-parser --merge-by-timestamp /var/log/samba
</programlisting>
</refsect1>