diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 83c8be403..c8c0d7f6c 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -20,7 +20,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] New features:: - * core: weechat-headless logs to stdout rather than ~/.weechat/weechat.log (issue #1475) + * core: add command line option "--stdout" in weechat-headless binary to log to stdout rather than ~/.weechat/weechat.log (issue #1475, issue #1477) * buflist: evaluate option buflist.look.sort so that sort can be customized for each of the three buflist bar items (issue #1465) * relay: add command "handshake" in weechat relay protocol and nonce to prevent replay attacks, add options relay.network.password_hash_algo, relay.network.password_hash_iterations, relay.network.nonce_size (issue #1474) * relay: add option relay.network.auth_timeout diff --git a/doc/cs/cmdline_options.cs.adoc b/doc/cs/cmdline_options.cs.adoc index 440404e96..cd0554d17 100644 --- a/doc/cs/cmdline_options.cs.adoc +++ b/doc/cs/cmdline_options.cs.adoc @@ -9,6 +9,12 @@ Run WeeChat in background, as a daemon (works only with the command *weechat-headless*). +// TRANSLATION MISSING +*--stdout*:: + Display log messages on standard output instead of writing them in log file + (works only with the command *weechat-headless*, not compatible with option + "--daemon"). + *-d*, *--dir* __:: Nastav cestu jako dovmský adresář pro WeeChat (použitou pro konfigurační soubory, logy, uživatelské pluginy a skripty), výchozí hodnota je diff --git a/doc/cs/weechat-headless.1.cs.adoc b/doc/cs/weechat-headless.1.cs.adoc index 4076c8b70..cc4619921 100644 --- a/doc/cs/weechat-headless.1.cs.adoc +++ b/doc/cs/weechat-headless.1.cs.adoc @@ -16,7 +16,7 @@ weechat-headless - the extensible chat client (headless version) // TRANSLATION MISSING [verse] -*weechat-headless* [-a|--no-connect] [--daemon] [-d|--dir ] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins ] [-r|--run-command ] [-s|--no-script] [--upgrade] [debug-option...] [plugin:option...] +*weechat-headless* [-a|--no-connect] [--daemon] [--stdout] [-d|--dir ] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins ] [-r|--run-command ] [-s|--no-script] [--upgrade] [debug-option...] [plugin:option...] *weechat-headless* [-c|--colors] *weechat-headless* [-h|--help] *weechat-headless* [-l|--license] diff --git a/doc/de/cmdline_options.de.adoc b/doc/de/cmdline_options.de.adoc index 225a26eeb..1e3eea743 100644 --- a/doc/de/cmdline_options.de.adoc +++ b/doc/de/cmdline_options.de.adoc @@ -8,6 +8,12 @@ startet WeeChat im Hintergrund, als Deamon (funktioniert nur mit dem Befehl *weechat-headless*). +// TRANSLATION MISSING +*--stdout*:: + Display log messages on standard output instead of writing them in log file + (works only with the command *weechat-headless*, not compatible with option + "--daemon"). + *-d*, *--dir* __:: legt den Konfigurationsordner für WeeChat fest in welchem die Erweiterungen, Skripten, Protokolldateien etc.pp. gesichert werden (Voreinstellung: "~/.weechat"). diff --git a/doc/de/weechat-headless.1.de.adoc b/doc/de/weechat-headless.1.de.adoc index 7fedb436b..eb20ee635 100644 --- a/doc/de/weechat-headless.1.de.adoc +++ b/doc/de/weechat-headless.1.de.adoc @@ -13,7 +13,7 @@ weechat-headless - der erweiterbare Chat Client (headless version) == SYNOPSIS [verse] -*weechat-headless* [-a|--no-connect] [--daemon] [-d|--dir ] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins ] [-r|--run-command ] [-s|--no-script] [--upgrade] [debug-option...] [plugin:option...] +*weechat-headless* [-a|--no-connect] [--daemon] [--stdout] [-d|--dir ] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins ] [-r|--run-command ] [-s|--no-script] [--upgrade] [debug-option...] [plugin:option...] *weechat-headless* [-c|--colors] *weechat-headless* [-h|--help] *weechat-headless* [-l|--license] diff --git a/doc/en/cmdline_options.en.adoc b/doc/en/cmdline_options.en.adoc index d43a2426c..190be3772 100644 --- a/doc/en/cmdline_options.en.adoc +++ b/doc/en/cmdline_options.en.adoc @@ -8,6 +8,11 @@ Run WeeChat in background, as a daemon (works only with the command *weechat-headless*). +*--stdout*:: + Display log messages on standard output instead of writing them in log file + (works only with the command *weechat-headless*, not compatible with option + "--daemon"). + *-d*, *--dir* __:: Set path as home for WeeChat (used for configuration files, logs, user plugins and scripts), default value is "~/.weechat" (note: directory is diff --git a/doc/en/weechat-headless.1.en.adoc b/doc/en/weechat-headless.1.en.adoc index 0dab42ecb..9b9c4ee47 100644 --- a/doc/en/weechat-headless.1.en.adoc +++ b/doc/en/weechat-headless.1.en.adoc @@ -13,7 +13,7 @@ weechat-headless - the extensible chat client (headless version) == SYNOPSIS [verse] -*weechat-headless* [-a|--no-connect] [--daemon] [-d|--dir ] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins ] [-r|--run-command ] [-s|--no-script] [--upgrade] [debug-option...] [plugin:option...] +*weechat-headless* [-a|--no-connect] [--daemon] [--stdout] [-d|--dir ] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins ] [-r|--run-command ] [-s|--no-script] [--upgrade] [debug-option...] [plugin:option...] *weechat-headless* [-c|--colors] *weechat-headless* [-h|--help] *weechat-headless* [-l|--license] diff --git a/doc/fr/cmdline_options.fr.adoc b/doc/fr/cmdline_options.fr.adoc index e8cd0021f..ee1bb8334 100644 --- a/doc/fr/cmdline_options.fr.adoc +++ b/doc/fr/cmdline_options.fr.adoc @@ -8,6 +8,11 @@ Lancer WeeChat en tâche de fond, comme un daemon (fonctionne seulement avec la commande *weechat-headless*). +*--stdout*:: + Afficher les messages de log sur la sortie standard plutôt que de les écrire + dans le fichier de log (fonctionne seulement avec la commande + *weechat-headless*, non compatible avec l'option "--daemon"). + *-d*, *--dir* __:: Définir le répertoire comme étant la base de WeeChat (utilisé pour les fichiers de configuration, logs, extensions diff --git a/doc/fr/weechat-headless.1.fr.adoc b/doc/fr/weechat-headless.1.fr.adoc index 8b354e0eb..b0a428f1f 100644 --- a/doc/fr/weechat-headless.1.fr.adoc +++ b/doc/fr/weechat-headless.1.fr.adoc @@ -13,7 +13,7 @@ weechat-headless - le client de discussion extensible (version sans interface) == SYNOPSIS [verse] -*weechat-headless* [-a|--no-connect] [--daemon] [-d|--dir ] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins ] [-r|--run-command ] [-s|--no-script] [--upgrade] [option-debug...] [plugin:option...] +*weechat-headless* [-a|--no-connect] [--daemon] [--stdout] [-d|--dir ] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins ] [-r|--run-command ] [-s|--no-script] [--upgrade] [option-debug...] [plugin:option...] *weechat-headless* [-c|--colors] *weechat-headless* [-h|--help] *weechat-headless* [-l|--license] diff --git a/doc/it/cmdline_options.it.adoc b/doc/it/cmdline_options.it.adoc index ff3fc215c..f6ffdd8a3 100644 --- a/doc/it/cmdline_options.it.adoc +++ b/doc/it/cmdline_options.it.adoc @@ -9,6 +9,12 @@ Run WeeChat in background, as a daemon (works only with the command *weechat-headless*). +// TRANSLATION MISSING +*--stdout*:: + Display log messages on standard output instead of writing them in log file + (works only with the command *weechat-headless*, not compatible with option + "--daemon"). + // TRANSLATION MISSING *-d*, *--dir* __:: Imposta una directory come home per WeeChat (utilizzata per i file di diff --git a/doc/it/weechat-headless.1.it.adoc b/doc/it/weechat-headless.1.it.adoc index d8401aec1..bce6694fd 100644 --- a/doc/it/weechat-headless.1.it.adoc +++ b/doc/it/weechat-headless.1.it.adoc @@ -16,7 +16,7 @@ weechat-headless - the extensible chat client (headless version) // TRANSLATION MISSING [verse] -*weechat-headless* [-a|--no-connect] [--daemon] [-d|--dir ] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins ] [-r|--run-command ] [-s|--no-script] [--upgrade] [debug-option...] [plugin:option...] +*weechat-headless* [-a|--no-connect] [--daemon] [--stdout] [-d|--dir ] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins ] [-r|--run-command ] [-s|--no-script] [--upgrade] [debug-option...] [plugin:option...] *weechat-headless* [-c|--colors] *weechat-headless* [-h|--help] *weechat-headless* [-l|--license] diff --git a/doc/ja/cmdline_options.ja.adoc b/doc/ja/cmdline_options.ja.adoc index c85e76ec2..743821ee2 100644 --- a/doc/ja/cmdline_options.ja.adoc +++ b/doc/ja/cmdline_options.ja.adoc @@ -8,6 +8,12 @@ WeeChat をデーモン化してバックグラウンド実行 (*weechat-headless* コマンドで起動した場合のみ有効) +// TRANSLATION MISSING +*--stdout*:: + Display log messages on standard output instead of writing them in log file + (works only with the command *weechat-headless*, not compatible with option + "--daemon"). + *-d*, *--dir* __:: WeeChat のホームディレクトリを path に設定 (設定ファイル、ログ、 ユーザプラグイン、スクリプトに利用される)、初期値は "~/.weechat"。 diff --git a/doc/ja/weechat-headless.1.ja.adoc b/doc/ja/weechat-headless.1.ja.adoc index 0b7a44dfd..ae9cffe2d 100644 --- a/doc/ja/weechat-headless.1.ja.adoc +++ b/doc/ja/weechat-headless.1.ja.adoc @@ -13,7 +13,7 @@ weechat-headless - 拡張可能なチャットクライアント (ヘッドレ == 書式 [verse] -*weechat-headless* [-a|--no-connect] [--daemon] [-d|--dir ] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins ] [-r|--run-command ] [-s|--no-script] [--upgrade] [debug-option...] [plugin:option...] +*weechat-headless* [-a|--no-connect] [--daemon] [--stdout] [-d|--dir ] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins ] [-r|--run-command ] [-s|--no-script] [--upgrade] [debug-option...] [plugin:option...] *weechat-headless* [-c|--colors] *weechat-headless* [-h|--help] *weechat-headless* [-l|--license] diff --git a/doc/pl/cmdline_options.pl.adoc b/doc/pl/cmdline_options.pl.adoc index 5461846fb..d118ea4d1 100644 --- a/doc/pl/cmdline_options.pl.adoc +++ b/doc/pl/cmdline_options.pl.adoc @@ -7,6 +7,12 @@ *--daemon*:: Uruchamia WeeChat w tle jako demona (działa tylko z komendą *weechat-headless*). +// TRANSLATION MISSING +*--stdout*:: + Display log messages on standard output instead of writing them in log file + (works only with the command *weechat-headless*, not compatible with option + "--daemon"). + *-d*, *--dir* _<ścieżka>_:: Ustawia ścieżkę jako katalog domowy WeeChat (używany dla plików konfiguracyjnych, logów, wtyczek użytkownika i skryptów), domyślna wartość diff --git a/doc/pl/weechat-headless.1.pl.adoc b/doc/pl/weechat-headless.1.pl.adoc index 835b1622c..add5e3c28 100644 --- a/doc/pl/weechat-headless.1.pl.adoc +++ b/doc/pl/weechat-headless.1.pl.adoc @@ -13,7 +13,7 @@ weechat-headless - rozszerzalny klient rozmów (wersja headless) == SKŁADNIA [verse] -*weechat-headless* [-a|--no-connect] [--daemon] [-d|--dir ] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins ] [-r|--run-command ] [-s|--no-script] [--upgrade] [debug-option...] [wtyczka:opcja...] +*weechat-headless* [-a|--no-connect] [--daemon] [--stdout] [-d|--dir ] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins ] [-r|--run-command ] [-s|--no-script] [--upgrade] [debug-option...] [wtyczka:opcja...] *weechat-headless* [-c|--colors] *weechat-headless* [-h|--help] *weechat-headless* [-l|--license] diff --git a/doc/ru/cmdline_options.ru.adoc b/doc/ru/cmdline_options.ru.adoc index 87f3d918f..6607119c8 100644 --- a/doc/ru/cmdline_options.ru.adoc +++ b/doc/ru/cmdline_options.ru.adoc @@ -9,6 +9,12 @@ Run WeeChat in background, as a daemon (works only with the command *weechat-headless*). +// TRANSLATION MISSING +*--stdout*:: + Display log messages on standard output instead of writing them in log file + (works only with the command *weechat-headless*, not compatible with option + "--daemon"). + *-d*, *--dir* _<путь>_:: Установить <путь> как домашнюю директорию для WeeChat (используется для конфигурационных файлов, логов, пользовательских плагинов и скриптов). diff --git a/doc/ru/weechat-headless.1.ru.adoc b/doc/ru/weechat-headless.1.ru.adoc index 81cca351d..fc5a1d532 100644 --- a/doc/ru/weechat-headless.1.ru.adoc +++ b/doc/ru/weechat-headless.1.ru.adoc @@ -16,7 +16,7 @@ weechat-headless - расширяемый чат-клиент (headless version) // TRANSLATION MISSING [verse] -*weechat-headless* [-a|--no-connect] [--daemon] [-d|--dir ] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins ] [-r|--run-command ] [-s|--no-script] [--upgrade] [debug-option...] [plugin:option...] +*weechat-headless* [-a|--no-connect] [--daemon] [--stdout] [-d|--dir ] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins ] [-r|--run-command ] [-s|--no-script] [--upgrade] [debug-option...] [plugin:option...] *weechat-headless* [-c|--colors] *weechat-headless* [-h|--help] *weechat-headless* [-l|--license] diff --git a/po/cs.po b/po/cs.po index 598d45491..5ca8e342f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-18 11:30+0200\n" +"POT-Creation-Date: 2020-04-19 11:21+0200\n" "PO-Revision-Date: 2020-04-18 11:34+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -210,6 +210,15 @@ msgid "" "and does not run in background)\n" msgstr "" +msgid "" +" --stdout display log messages on standard output instead " +"of writing them in log file\n" +msgstr "" + +msgid "" +" (option ignored if option \"--daemon\" is given)\n" +msgstr "" + msgid "" "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n" " --no-dlclose do not call function dlclose after plugins are " diff --git a/po/de.po b/po/de.po index 496a92876..3b9cd64b8 100644 --- a/po/de.po +++ b/po/de.po @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-18 11:30+0200\n" +"POT-Creation-Date: 2020-04-19 11:21+0200\n" "PO-Revision-Date: 2020-04-18 11:34+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -232,6 +232,15 @@ msgstr "" " (standardmäßig blockiert WeeChat im " "Hintergrundmodus den Prozess und gibt das Terminal nicht frei)\n" +msgid "" +" --stdout display log messages on standard output instead " +"of writing them in log file\n" +msgstr "" + +msgid "" +" (option ignored if option \"--daemon\" is given)\n" +msgstr "" + msgid "" "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n" " --no-dlclose do not call function dlclose after plugins are " diff --git a/po/es.po b/po/es.po index 179858d01..494a0d4db 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-18 11:30+0200\n" +"POT-Creation-Date: 2020-04-19 11:21+0200\n" "PO-Revision-Date: 2020-04-18 11:34+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -221,6 +221,15 @@ msgid "" "and does not run in background)\n" msgstr "" +msgid "" +" --stdout display log messages on standard output instead " +"of writing them in log file\n" +msgstr "" + +msgid "" +" (option ignored if option \"--daemon\" is given)\n" +msgstr "" + msgid "" "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n" " --no-dlclose do not call function dlclose after plugins are " diff --git a/po/fr.po b/po/fr.po index 0642c44e0..5346b16b3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-18 11:30+0200\n" -"PO-Revision-Date: 2020-04-18 11:34+0200\n" +"POT-Creation-Date: 2020-04-19 11:21+0200\n" +"PO-Revision-Date: 2020-04-19 11:22+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -221,6 +221,19 @@ msgstr "" " (par défaut en mode sans interface WeeChat est " "bloquant et ne tourne pas en tâche de fond)\n" +msgid "" +" --stdout display log messages on standard output instead " +"of writing them in log file\n" +msgstr "" +" --stdout afficher les messages de log sur la sortie " +"standard plutôt que de les écrire dans le fichier de log\n" + +msgid "" +" (option ignored if option \"--daemon\" is given)\n" +msgstr "" +" (option ignorée si l'option \"--daemon\" est " +"donnée)\n" + msgid "" "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n" " --no-dlclose do not call function dlclose after plugins are " diff --git a/po/hu.po b/po/hu.po index 210be020b..205c5630f 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-18 11:30+0200\n" +"POT-Creation-Date: 2020-04-19 11:21+0200\n" "PO-Revision-Date: 2020-04-18 11:34+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -212,6 +212,15 @@ msgid "" "and does not run in background)\n" msgstr "" +msgid "" +" --stdout display log messages on standard output instead " +"of writing them in log file\n" +msgstr "" + +msgid "" +" (option ignored if option \"--daemon\" is given)\n" +msgstr "" + msgid "" "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n" " --no-dlclose do not call function dlclose after plugins are " diff --git a/po/it.po b/po/it.po index 4d76f2061..3960ba004 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-18 11:30+0200\n" +"POT-Creation-Date: 2020-04-19 11:21+0200\n" "PO-Revision-Date: 2020-04-18 11:34+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -213,6 +213,15 @@ msgid "" "and does not run in background)\n" msgstr "" +msgid "" +" --stdout display log messages on standard output instead " +"of writing them in log file\n" +msgstr "" + +msgid "" +" (option ignored if option \"--daemon\" is given)\n" +msgstr "" + msgid "" "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n" " --no-dlclose do not call function dlclose after plugins are " diff --git a/po/ja.po b/po/ja.po index a60d38c66..fba3c0802 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-18 11:30+0200\n" +"POT-Creation-Date: 2020-04-19 11:21+0200\n" "PO-Revision-Date: 2020-04-18 11:34+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language-Team: Polish \n" @@ -221,6 +221,15 @@ msgstr "" " (domyślnie w trybie bez interfejsu WeeChat nie " "uruchamia się w tle)\n" +msgid "" +" --stdout display log messages on standard output instead " +"of writing them in log file\n" +msgstr "" + +msgid "" +" (option ignored if option \"--daemon\" is given)\n" +msgstr "" + msgid "" "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n" " --no-dlclose do not call function dlclose after plugins are " diff --git a/po/pt.po b/po/pt.po index a5e982500..6a91dab8d 100644 --- a/po/pt.po +++ b/po/pt.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-18 11:30+0200\n" +"POT-Creation-Date: 2020-04-19 11:21+0200\n" "PO-Revision-Date: 2020-04-18 11:34+0200\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -212,6 +212,15 @@ msgid "" "and does not run in background)\n" msgstr "" +msgid "" +" --stdout display log messages on standard output instead " +"of writing them in log file\n" +msgstr "" + +msgid "" +" (option ignored if option \"--daemon\" is given)\n" +msgstr "" + msgid "" "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n" " --no-dlclose do not call function dlclose after plugins are " diff --git a/po/pt_BR.po b/po/pt_BR.po index fe10004f7..787e1d7ed 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-18 11:30+0200\n" +"POT-Creation-Date: 2020-04-19 11:21+0200\n" "PO-Revision-Date: 2020-04-18 11:34+0200\n" "Last-Translator: Eduardo Elias \n" "Language-Team: weechat-dev \n" @@ -245,6 +245,15 @@ msgid "" "and does not run in background)\n" msgstr "" +msgid "" +" --stdout display log messages on standard output instead " +"of writing them in log file\n" +msgstr "" + +msgid "" +" (option ignored if option \"--daemon\" is given)\n" +msgstr "" + msgid "" "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n" " --no-dlclose do not call function dlclose after plugins are " diff --git a/po/ru.po b/po/ru.po index 226b5604e..cb226d1ef 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-18 11:30+0200\n" +"POT-Creation-Date: 2020-04-19 11:21+0200\n" "PO-Revision-Date: 2020-04-18 11:34+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -221,6 +221,15 @@ msgid "" "and does not run in background)\n" msgstr "" +msgid "" +" --stdout display log messages on standard output instead " +"of writing them in log file\n" +msgstr "" + +msgid "" +" (option ignored if option \"--daemon\" is given)\n" +msgstr "" + msgid "" "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n" " --no-dlclose do not call function dlclose after plugins are " diff --git a/po/tr.po b/po/tr.po index bbfce42db..c11e7c97c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-18 11:30+0200\n" +"POT-Creation-Date: 2020-04-19 11:21+0200\n" "PO-Revision-Date: 2019-11-03 08:38+0100\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -183,6 +183,15 @@ msgid "" "and does not run in background)\n" msgstr "" +msgid "" +" --stdout display log messages on standard output instead " +"of writing them in log file\n" +msgstr "" + +msgid "" +" (option ignored if option \"--daemon\" is given)\n" +msgstr "" + msgid "" "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n" " --no-dlclose do not call function dlclose after plugins are " diff --git a/po/weechat.pot b/po/weechat.pot index d500edebc..105cc58a4 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2020-04-18 11:30+0200\n" +"POT-Creation-Date: 2020-04-19 11:21+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -181,6 +181,15 @@ msgid "" "and does not run in background)\n" msgstr "" +msgid "" +" --stdout display log messages on standard output instead " +"of writing them in log file\n" +msgstr "" + +msgid "" +" (option ignored if option \"--daemon\" is given)\n" +msgstr "" + msgid "" "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n" " --no-dlclose do not call function dlclose after plugins are " diff --git a/src/core/wee-log.c b/src/core/wee-log.c index a08f1d276..a708b4bd2 100644 --- a/src/core/wee-log.c +++ b/src/core/wee-log.c @@ -68,7 +68,7 @@ log_open (const char *filename, const char *mode) if (weechat_log_file) return 0; - if (weechat_headless && !weechat_daemon) + if (weechat_log_stdout) { weechat_log_file = stdout; } @@ -88,8 +88,11 @@ log_open (const char *filename, const char *mode) if (!weechat_log_file) { - free (weechat_log_filename); - weechat_log_filename = NULL; + if (weechat_log_filename) + { + free (weechat_log_filename); + weechat_log_filename = NULL; + } return 0; } diff --git a/src/core/weechat.c b/src/core/weechat.c index fd90dbf06..f5f83a6c5 100644 --- a/src/core/weechat.c +++ b/src/core/weechat.c @@ -89,6 +89,7 @@ int weechat_headless = 0; /* 1 if running headless (no GUI) */ int weechat_daemon = 0; /* 1 if daemonized (no foreground) */ +int weechat_log_stdout = 0; /* 1 to log messages on stdout */ int weechat_debug_core = 0; /* debug level for core */ char *weechat_argv0 = NULL; /* WeeChat binary file name (argv[0])*/ int weechat_upgrading = 0; /* =1 if WeeChat is upgrading */ @@ -194,6 +195,14 @@ weechat_display_usage () stdout, _(" (by default in headless mode " "WeeChat is blocking and does not run in background)\n")); + string_fprintf ( + stdout, + _(" --stdout display log messages on standard " + "output instead of writing them in log file\n")); + string_fprintf ( + stdout, + _(" (option ignored if option " + "\"--daemon\" is given)\n")); string_fprintf (stdout, "\n"); } diff --git a/src/core/weechat.h b/src/core/weechat.h index 39917851f..c910746a1 100644 --- a/src/core/weechat.h +++ b/src/core/weechat.h @@ -101,6 +101,7 @@ struct t_weelist; /* global variables and functions */ extern int weechat_headless; extern int weechat_daemon; +extern int weechat_log_stdout; extern int weechat_debug_core; extern char *weechat_argv0; extern int weechat_upgrading; diff --git a/src/gui/curses/headless/main.c b/src/gui/curses/headless/main.c index 99df53d99..b6dd49e54 100644 --- a/src/gui/curses/headless/main.c +++ b/src/gui/curses/headless/main.c @@ -101,8 +101,9 @@ main (int argc, char *argv[]) weechat_headless = 1; /* - * If "--daemon" is received in command line arguments, - * daemonize the process. + * Parse extra options for headless mode: + * - "--daemon": daemonize the process + * - "--stdout": log messages to stdout (instead of log file) */ weechat_daemon = 0; for (i = 1; i < argc; i++) @@ -110,11 +111,17 @@ main (int argc, char *argv[]) if (strcmp (argv[i], "--daemon") == 0) { weechat_daemon = 1; - break; + } + else if (strcmp (argv[i], "--stdout") == 0) + { + weechat_log_stdout = 1; } } if (weechat_daemon) + { + weechat_log_stdout = 0; daemonize (); + } /* init, main loop and end */ weechat_init (argc, argv, &gui_main_init);