From c277f795ed998bc67312991e944254abed99eafc Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Sat, 30 Oct 2021 09:09:20 +0200 Subject: [PATCH 1/7] update readme --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9132614..f19c49f 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,9 @@ and it looks like this: ![textblocks format example](media/textlines.svg) +This format is compatible with tooling written for +[heroku/logfmt](https://brandur.org/logfmt). + Alternatively, you can use a multi-line format called `textblocks`: ![textblocks format example](media/textblocks.svg) @@ -326,9 +329,9 @@ the program. Topics in `chronicles_disabled_topics` have precedence over the ones in `chronicles_enabled_topics` or `chronicles_required_topics`. -### chronicles_disable_thread_id +### chronicles_disable_thread_id -Disable log thread(tid) +Disable log thread(tid) ### chronicles_log_level From 884e870048698a7dd17ee961f8f53b3c6f56c80a Mon Sep 17 00:00:00 2001 From: Zahary Karadjov Date: Tue, 9 Nov 2021 13:33:06 +0200 Subject: [PATCH 2/7] Don't log non-printable characters --- chronicles/log_output.nim | 45 ++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/chronicles/log_output.nim b/chronicles/log_output.nim index 69571c7..0d077a5 100644 --- a/chronicles/log_output.nim +++ b/chronicles/log_output.nim @@ -548,6 +548,41 @@ proc initLogRecord*(r: var TextLineRecord, r.level = lvl appendHeader(r, lvl, topics, name, true) +const + controlChars = {'\x00'..'\x1f'} + extendedAsciiChars = {'\x7f'..'\xff'} + escapedChars*: set[char] = strutils.NewLines + {'"', '\\'} + controlChars + extendedAsciiChars + quoteChars*: set[char] = {' ', '='} + +func containsEscapedChars*(str: string|cstring): bool = + for c in str: + if c in escapedChars: + return true + return false + +func needsQuotes*(str: string|cstring): bool = + for c in str: + if c in quoteChars: + return true + return false + +proc writeEscapedString*(output: var string, str: string|cstring) = + for c in str: + case c + of '"': output.add "\\\"" + of '\\': output.add "\\\\" + of '\r': output.add "\\r" + of '\n': output.add "\\n" + of '\t': output.add "\\t" + else: + const hexChars = "0123456789abcdef" + if c >= char(0x20) and c <= char(0x7e): + output.add c + else: + output.add("\\x") + output.add hexChars[int(c) shr 4 and 0xF] + output.add hexChars[int(c) and 0xF] + proc setProperty*(r: var TextLineRecord, key: string, val: auto) = append(r.output, " ") let valText = $val @@ -562,20 +597,20 @@ proc setProperty*(r: var TextLineRecord, key: string, val: auto) = # This is similar to how it's done in logfmt: # https://github.com/csquared/node-logfmt/blob/master/lib/stringify.js#L13 let - needsEscape = valText.find(NewLines + {'"', '\\'}) > -1 - needsQuote = valText.find({' ', '='}) > -1 + needsEscape = valText.find(escapedChars) > -1 + needsQuote = valText.find(quoteChars) > -1 if needsEscape or needsQuote: escaped = newStringOfCap(valText.len + valText.len div 8) + add(escaped, '"') if needsEscape: # addQuoted adds quotes and escapes a bunch of characters # XXX addQuoted escapes more characters than what we look for in above # needsEscape check - it's a bit weird that way - addQuoted(escaped, valText) + escaped.writeEscapedString(valText) elif needsQuote: - add(escaped, '"') add(escaped, valText) - add(escaped, '"') + add(escaped, '"') valueToWrite = addr escaped else: valueToWrite = unsafeAddr valText From 2f6569184bd92d458c712b6d4e70225982a0c852 Mon Sep 17 00:00:00 2001 From: jangko Date: Fri, 29 Oct 2021 19:55:07 +0700 Subject: [PATCH 3/7] bump mingw from v8.1.0 to v11.2.0 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad7ef90..5d2dd74 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,10 +82,10 @@ jobs: run: | mkdir -p external if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then - MINGW_URL="https://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win64/Personal Builds/mingw-builds/8.1.0/threads-posix/seh/x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z" + MINGW_URL="https://github.com/brechtsanders/winlibs_mingw/releases/download/11.2.0-12.0.1-9.0.0-r1/winlibs-x86_64-posix-seh-gcc-11.2.0-mingw-w64-9.0.0-r1.7z" ARCH=64 else - MINGW_URL="https://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win32/Personal Builds/mingw-builds/8.1.0/threads-posix/dwarf/i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z" + MINGW_URL="https://github.com/brechtsanders/winlibs_mingw/releases/download/11.2.0-12.0.1-9.0.0-r1/winlibs-i686-posix-dwarf-gcc-11.2.0-mingw-w64-9.0.0-r1.7z" ARCH=32 fi curl -L "$MINGW_URL" -o "external/mingw-${{ matrix.target.cpu }}.7z" From 72fa491865ab42890059bcc2eb26f820e935a0b5 Mon Sep 17 00:00:00 2001 From: jangko Date: Sat, 30 Oct 2021 13:12:23 +0700 Subject: [PATCH 4/7] ci: reenable windows matrix --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d2dd74..fc22164 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,10 +14,10 @@ jobs: cpu: i386 - os: macos cpu: amd64 - #- os: windows - #cpu: amd64 - #- os: windows - #cpu: i386 + - os: windows + cpu: amd64 + - os: windows + cpu: i386 include: - target: os: linux From 8f7424ac0a5632e61cd4e3f67f438b2f6159e12a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= Date: Thu, 18 Nov 2021 20:04:57 +0100 Subject: [PATCH 5/7] CI: test with multiple Nim versions (#106) * CI: test with multiple Nim versions - plus Nim-1.6 fix - and enable Windows * size.nim: halve the number of log lines --- .github/workflows/ci.yml | 136 ++++---- chronicles.nimble | 6 +- chronicles/options.nim | 4 +- tests/config.nims | 1 + tests/perf/release_opt_size.test | 2 +- tests/perf/size_check_debug.test | 2 +- tests/perf/size_check_release.test | 2 +- tests/size.nim | 500 ----------------------------- 8 files changed, 79 insertions(+), 574 deletions(-) create mode 100644 tests/config.nims diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc22164..3aabc5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,11 +1,15 @@ name: CI -on: [push, pull_request] +on: + push: + branches: + - master + pull_request: + workflow_dispatch: jobs: build: strategy: fail-fast: false - max-parallel: 20 matrix: target: - os: linux @@ -16,27 +20,33 @@ jobs: cpu: amd64 - os: windows cpu: amd64 - - os: windows - cpu: i386 + #- os: windows + #cpu: i386 + branch: [version-1-2, version-1-4, version-1-6, devel] include: - target: os: linux builder: ubuntu-18.04 + shell: bash - target: os: macos builder: macos-10.15 + shell: bash - target: os: windows builder: windows-2019 + shell: msys2 {0} - name: '${{ matrix.target.os }}-${{ matrix.target.cpu }}' + defaults: + run: + shell: ${{ matrix.shell }} + + name: '${{ matrix.target.os }}-${{ matrix.target.cpu }} (Nim ${{ matrix.branch }})' runs-on: ${{ matrix.builder }} + continue-on-error: ${{ matrix.branch == 'version-1-6' || matrix.branch == 'devel' }} steps: - - name: Checkout nim-chronicles + - name: Checkout uses: actions/checkout@v2 - with: - path: nim-chronicles - submodules: false - name: Install build dependencies (Linux i386) if: runner.os == 'Linux' && matrix.target.cpu == 'i386' @@ -58,13 +68,26 @@ jobs: chmod 755 external/bin/gcc external/bin/g++ echo '${{ github.workspace }}/external/bin' >> $GITHUB_PATH - - name: Restore MinGW-W64 (Windows) from cache - if: runner.os == 'Windows' - id: windows-mingw-cache - uses: actions/cache@v2 + - name: MSYS2 (Windows i386) + if: runner.os == 'Windows' && matrix.target.cpu == 'i386' + uses: msys2/setup-msys2@v2 + with: + path-type: inherit + msystem: MINGW32 + install: >- + base-devel + git + mingw-w64-i686-toolchain + + - name: MSYS2 (Windows amd64) + if: runner.os == 'Windows' && matrix.target.cpu == 'amd64' + uses: msys2/setup-msys2@v2 with: - path: external/mingw-${{ matrix.target.cpu }} - key: 'mingw-${{ matrix.target.cpu }}' + path-type: inherit + install: >- + base-devel + git + mingw-w64-x86_64-toolchain - name: Restore Nim DLLs dependencies (Windows) from cache if: runner.os == 'Windows' @@ -74,29 +97,10 @@ jobs: path: external/dlls-${{ matrix.target.cpu }} key: 'dlls-${{ matrix.target.cpu }}' - - name: Install MinGW64 dependency (Windows) - if: > - steps.windows-mingw-cache.outputs.cache-hit != 'true' && - runner.os == 'Windows' - shell: bash - run: | - mkdir -p external - if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then - MINGW_URL="https://github.com/brechtsanders/winlibs_mingw/releases/download/11.2.0-12.0.1-9.0.0-r1/winlibs-x86_64-posix-seh-gcc-11.2.0-mingw-w64-9.0.0-r1.7z" - ARCH=64 - else - MINGW_URL="https://github.com/brechtsanders/winlibs_mingw/releases/download/11.2.0-12.0.1-9.0.0-r1/winlibs-i686-posix-dwarf-gcc-11.2.0-mingw-w64-9.0.0-r1.7z" - ARCH=32 - fi - curl -L "$MINGW_URL" -o "external/mingw-${{ matrix.target.cpu }}.7z" - 7z x -y "external/mingw-${{ matrix.target.cpu }}.7z" -oexternal/ - mv external/mingw$ARCH external/mingw-${{ matrix.target.cpu }} - - name: Install DLLs dependencies (Windows) if: > steps.windows-dlls-cache.outputs.cache-hit != 'true' && runner.os == 'Windows' - shell: bash run: | mkdir -p external curl -L "https://nim-lang.org/download/windeps.zip" -o external/windeps.zip @@ -105,58 +109,60 @@ jobs: - name: Path to cached dependencies (Windows) if: > runner.os == 'Windows' - shell: bash run: | echo '${{ github.workspace }}'"/external/mingw-${{ matrix.target.cpu }}/bin" >> $GITHUB_PATH echo '${{ github.workspace }}'"/external/dlls-${{ matrix.target.cpu }}" >> $GITHUB_PATH - - name: Get latest nimbus-build-system commit hash - id: versions - shell: bash - run: | - getHash() { - git ls-remote "https://github.com/$1" "${2:-HEAD}" | cut -f 1 - } - nbsHash=$(getHash status-im/nimbus-build-system) - echo "::set-output name=nimbus_build_system::$nbsHash" - - - name: Restore prebuilt Nim from cache - id: nim-cache - uses: actions/cache@v2 - with: - path: NimBinaries - key: 'NimBinaries-${{ matrix.target.os }}-${{ matrix.target.cpu }}-${{ steps.versions.outputs.nimbus_build_system }}' - - - name: Build Nim and associated tools - shell: bash + - name: Derive environment variables run: | - curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_nim.sh if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then PLATFORM=x64 else PLATFORM=x86 fi - if [[ '${{ matrix.target.os }}' == 'windows' ]]; then + echo "PLATFORM=$PLATFORM" >> $GITHUB_ENV + + ncpu= + MAKE_CMD="make" + case '${{ runner.os }}' in + 'Linux') + ncpu=$(nproc) + ;; + 'macOS') + ncpu=$(sysctl -n hw.ncpu) + ;; + 'Windows') + ncpu=$NUMBER_OF_PROCESSORS MAKE_CMD="mingw32-make" - else - MAKE_CMD="make" - fi - env MAKE="$MAKE_CMD -j2" ARCH_OVERRIDE=$PLATFORM CC=gcc bash build_nim.sh nim csources dist/nimble NimBinaries + ;; + esac + [[ -z "$ncpu" || $ncpu -le 0 ]] && ncpu=1 + echo "ncpu=$ncpu" >> $GITHUB_ENV + echo "MAKE_CMD=${MAKE_CMD}" >> $GITHUB_ENV + + - name: Build Nim and Nimble + run: | + curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_nim.sh + env MAKE="${MAKE_CMD} -j${ncpu}" ARCH_OVERRIDE=${PLATFORM} NIM_COMMIT=${{ matrix.branch }} \ + QUICK_AND_DIRTY_COMPILER=1 QUICK_AND_DIRTY_NIMBLE=1 CC=gcc \ + bash build_nim.sh nim csources dist/nimble NimBinaries echo '${{ github.workspace }}/nim/bin' >> $GITHUB_PATH - name: Setup environment - shell: bash run: | if [[ '${{ matrix.target.os }}' == 'linux' ]]; then echo '/home/runner/.nimble/bin' >> $GITHUB_PATH + elif [[ '${{ matrix.target.os }}' == 'windows' ]]; then + echo '/c/Users/runneradmin/.nimble/bin' >> $GITHUB_PATH else echo '~/.nimble/bin' >> $GITHUB_PATH fi - - name: Run nim-chronicles tests - shell: bash - working-directory: nim-chronicles + - name: Run tests run: | + nim --version + nimble --version nimble install -y --depsOnly - nimble test + #nimble test # can't find or run "ntu" on Windows + ntu test tests diff --git a/chronicles.nimble b/chronicles.nimble index 0c7c582..17ac737 100644 --- a/chronicles.nimble +++ b/chronicles.nimble @@ -12,8 +12,4 @@ requires "testutils" requires "json_serialization" task test, "run CPU tests": - when defined(windows): - # exec "cmd.exe /C ntu.cmd test tests" - echo "`ntu` doesn't work on Windows" - else: - exec "ntu test tests" + exec "ntu test tests" diff --git a/chronicles/options.nim b/chronicles/options.nim index f4aee12..f285f43 100644 --- a/chronicles/options.nim +++ b/chronicles/options.nim @@ -124,7 +124,9 @@ proc handleEnumOption(E: typedesc[enum], type R = type(result) return R(0) else: - return parseEnum[E](optValue) + # This enum parsing is supposed to be case insensitive, but it isn't in + # Nim-1.6.0. + return parseEnum[E](optValue.capitalizeAscii()) except: error &"'{optValue}' is not a recognized value for '{optName}'. " & &"Allowed values are {enumValues E}" diff --git a/tests/config.nims b/tests/config.nims new file mode 100644 index 0000000..78ead1a --- /dev/null +++ b/tests/config.nims @@ -0,0 +1 @@ +switch("path", "../") diff --git a/tests/perf/release_opt_size.test b/tests/perf/release_opt_size.test index cda4fae..0e4f6de 100644 --- a/tests/perf/release_opt_size.test +++ b/tests/perf/release_opt_size.test @@ -2,7 +2,7 @@ program="../lexical_scopes" chronicles_sinks="textlines[stdout]" chronicles_colors=None chronicles_timestamps=None -max_size=175000 +max_size=450000 release --opt:size diff --git a/tests/perf/size_check_debug.test b/tests/perf/size_check_debug.test index e4d8914..a02abeb 100644 --- a/tests/perf/size_check_debug.test +++ b/tests/perf/size_check_debug.test @@ -1,5 +1,5 @@ program="../size" -max_size=1250000 +max_size=1400000 chronicles_sinks="textlines[stdout]" chronicles_colors=AnsiColors diff --git a/tests/perf/size_check_release.test b/tests/perf/size_check_release.test index 92ea4fa..70cd3e8 100644 --- a/tests/perf/size_check_release.test +++ b/tests/perf/size_check_release.test @@ -1,5 +1,5 @@ program="../size" -max_size=1000000 +max_size=1200000 release chronicles_sinks="textlines[stdout]" diff --git a/tests/size.nim b/tests/size.nim index c279674..6830288 100644 --- a/tests/size.nim +++ b/tests/size.nim @@ -500,504 +500,4 @@ info "hello", a=1, b=2, c=3, d=4, e=5 info "hello", a=1, b=2, c=3, d=4, e=5 info "hello", a=1, b=2, c=3, d=4, e=5 info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 -info "hello", a=1, b=2, c=3, d=4, e=5 From 527b2bd3f44a47af03d3d3c940348e0cb8826652 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Fri, 8 Apr 2022 09:46:52 +0200 Subject: [PATCH 6/7] enable styleCheck:usages (nbc branch) (#113) --- chronicles/helpers.nim | 2 +- chronicles/log_output.nim | 8 ++++---- chronicles/topics_registry.nim | 2 +- nim.cfg | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/chronicles/helpers.nim b/chronicles/helpers.nim index 7e5f098..5d117a3 100644 --- a/chronicles/helpers.nim +++ b/chronicles/helpers.nim @@ -2,7 +2,7 @@ import tables, strutils, strformat, topics_registry -func parseTopicDirectives*(directives: openarray[string]): Table[string, TopicSettings] = +func parseTopicDirectives*(directives: openArray[string]): Table[string, TopicSettings] = result = initTable[string, TopicSettings]() for directive in directives: diff --git a/chronicles/log_output.nim b/chronicles/log_output.nim index 0d077a5..d4423b1 100644 --- a/chronicles/log_output.nim +++ b/chronicles/log_output.nim @@ -263,7 +263,7 @@ proc selectRecordType(s: var StreamCodeNodes, sink: SinkSpec): NimNode = # Check if a buffered output is needed if defined(js) or sink.destinations.len > 1 or - sink.destinations[0].kind in {oSyslog,oDynamic} or + sink.destinations[0].kind in {oSysLog,oDynamic} or compileOption("threads"): # Here, we build the list of outputs as a tuple @@ -551,7 +551,7 @@ proc initLogRecord*(r: var TextLineRecord, const controlChars = {'\x00'..'\x1f'} extendedAsciiChars = {'\x7f'..'\xff'} - escapedChars*: set[char] = strutils.NewLines + {'"', '\\'} + controlChars + extendedAsciiChars + escapedChars*: set[char] = strutils.Newlines + {'"', '\\'} + controlChars + extendedAsciiChars quoteChars*: set[char] = {' ', '='} func containsEscapedChars*(str: string|cstring): bool = @@ -652,7 +652,7 @@ proc setProperty*(r: var TextBlockRecord, key: string, val: auto) = append(r.output, ": ") applyStyle(r, styleBright) - if valText.find(NewLines) == -1: + if valText.find(Newlines) == -1: append(r.output, valText) append(r.output, "\n") else: @@ -716,7 +716,7 @@ template setFirstProperty*(r: var JsonRecord, key: string, val: auto) = proc flushRecord*(r: var JsonRecord) = when defined(js): - r.output.append JSON.stringify(r.record) + r.output.append Json.stringify(r.record) else: r.jsonWriter.endRecord() r.outStream.write '\n' diff --git a/chronicles/topics_registry.nim b/chronicles/topics_registry.nim index bb8becf..0c3f739 100644 --- a/chronicles/topics_registry.nim +++ b/chronicles/topics_registry.nim @@ -82,7 +82,7 @@ proc setTopicState*(name: string, return true proc topicsMatch*(logStmtLevel: LogLevel, - logStmtTopics: openarray[ptr TopicSettings]): bool = + logStmtTopics: openArray[ptr TopicSettings]): bool = lockRegistry: var hasEnabledTopics = gTotalEnabledTopics > 0 diff --git a/nim.cfg b/nim.cfg index 412caee..c902ca2 100644 --- a/nim.cfg +++ b/nim.cfg @@ -1,2 +1,3 @@ --path: "." - +--styleCheck:usages +--styleCheck:error From bd5a0994bad1869f4071a69a368040c77d93cbcd Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Fri, 17 Nov 2023 09:40:15 +0100 Subject: [PATCH 7/7] fix chronos v4 compatiblity (#138) `yield` has never worked correctly in chronos - removing broken function. Also, the "official" way of checking the state of the future is via `failed` --- chronicles/chronos_tools.nim | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/chronicles/chronos_tools.nim b/chronicles/chronos_tools.nim index 88a27f2..266e41a 100644 --- a/chronicles/chronos_tools.nim +++ b/chronicles/chronos_tools.nim @@ -11,12 +11,5 @@ proc catchOrQuit*(error: Exception) = proc traceAsyncErrors*(fut: FutureBase) = fut.addCallback do (arg: pointer): - if not fut.error.isNil: + if fut.failed(): catchOrQuit fut.error[] - -template traceAwaitErrors*(fut: FutureBase) = - let f = fut - yield f - if not f.error.isNil: - catchOrQuit f.error[] -