From fb51fb605246d47ad68225d6dd2a149aa160c1d9 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Mon, 26 Aug 2013 18:21:16 +0200 Subject: [PATCH] logger: add option "flush" for command /logger --- ChangeLog | 3 +- doc/de/autogen/user/logger_commands.txt | 36 ++++++++-------- doc/en/autogen/user/logger_commands.txt | 2 + doc/fr/autogen/user/logger_commands.txt | 2 + doc/it/autogen/user/logger_commands.txt | 38 +++++++++-------- doc/ja/autogen/user/logger_commands.txt | 36 ++++++++-------- po/cs.po | 7 ++- po/de.po | 7 ++- po/es.po | 7 ++- po/fr.po | 10 +++-- po/hu.po | 5 ++- po/it.po | 7 ++- po/ja.po | 7 ++- po/pl.po | 7 ++- po/pt_BR.po | 6 ++- po/ru.po | 5 ++- po/tr.po | 6 ++- po/weechat.pot | 5 ++- src/plugins/logger/logger.c | 57 ++++++++++++++++--------- 19 files changed, 155 insertions(+), 98 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf63b318b..9ac9cf343 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= Sébastien Helleu -v0.4.2-dev, 2013-08-25 +v0.4.2-dev, 2013-08-26 This document lists all changes for each version. @@ -106,6 +106,7 @@ Version 0.4.2 (under dev!) (patch #8062) * irc: fix multiple nicks in command /query (separated by commas): open one buffer per nick +* logger: add option "flush" for command /logger * lua: fix interpreter used in API functions (bug #39470) * relay: add command "ping" in weechat protocol (task #12689) * relay: fix binding to an IP address (bug #39119) diff --git a/doc/de/autogen/user/logger_commands.txt b/doc/de/autogen/user/logger_commands.txt index 35444dcf5..e586c9b10 100644 --- a/doc/de/autogen/user/logger_commands.txt +++ b/doc/de/autogen/user/logger_commands.txt @@ -3,32 +3,34 @@ ........................................ /logger list set + flush disable - list: zeigt, für geöffnete Buffer, den Status der Protokollierung an - set: legt den Level fest, nach dem der aktuelle Buffer protokolliert werden soll - level: legt fest, welche Nachrichten protokolliert werden sollen (0 = nichts protokollieren, 1 = nur die wichtigsten Nachrichten protokollieren .. 9 = protokolliere alle Nachrichten) -disable: die Protokollierung wird für den aktuellen Buffer ausgeschaltet (der Level wird auf 0 gestellt) + list: show logging status for opened buffers + set: set logging level on current buffer + level: level for messages to be logged (0 = logging disabled, 1 = a few messages (most important) .. 9 = all messages) + flush: write all log files now +disable: disable logging on current buffer (set level to 0) -Die Optionen "logger.level.*" und "logger.mask.*" können genutzt werden um den Level der Protokollierung festzulegen und um eine Maske für einen oder mehrere Buffer zu definieren. +Options "logger.level.*" and "logger.mask.*" can be used to set level or mask for a buffer, or buffers beginning with name. -Level der Protokollierung, die die IRC Erweiterung unterstützt: - 1: Nachrichten von Usern, private Nachrichten und Bemerkungen - 2: Wechsel von Nicks (/nick) - 3: Nachrichten vom Server - 4: join/part/quit Nachrichten - 9: alle Nachrichten +Log levels used by IRC plugin: + 1: user message, notice, private + 2: nick change + 3: server message + 4: join/part/quit + 9: all other messages -Beispiele: - Stellt den Level für den aktuellen Buffer auf 5 ein: +Examples: + set level to 5 for current buffer: /logger set 5 - Die Protokollierung für den aktuellen Buffer wird ausgeschaltet: + disable logging for current buffer: /logger disable - Stellt den Level für alle IRC-Buffer auf 3 ein: + set level to 3 for all IRC buffers: /set logger.level.irc 3 - Die Protokollierung, für den WeeChat Haupt-Buffer, wird deaktiviert: + disable logging for main WeeChat buffer: /set logger.level.core.weechat 0 - Für jeden IRC-Server wird ein separates Verzeichnis erstellt und darin eine eigene Protokoll-Datei, für jeden Channel: + use a directory per IRC server and a file per channel inside: /set logger.mask.irc "$server/$channel.weechatlog" ........................................ diff --git a/doc/en/autogen/user/logger_commands.txt b/doc/en/autogen/user/logger_commands.txt index e49b68eb9..c3bf32b0b 100644 --- a/doc/en/autogen/user/logger_commands.txt +++ b/doc/en/autogen/user/logger_commands.txt @@ -3,11 +3,13 @@ ........................................ /logger list set + flush disable list: show logging status for opened buffers set: set logging level on current buffer level: level for messages to be logged (0 = logging disabled, 1 = a few messages (most important) .. 9 = all messages) + flush: write all log files now disable: disable logging on current buffer (set level to 0) Options "logger.level.*" and "logger.mask.*" can be used to set level or mask for a buffer, or buffers beginning with name. diff --git a/doc/fr/autogen/user/logger_commands.txt b/doc/fr/autogen/user/logger_commands.txt index 3c3d59dfb..686fd1be4 100644 --- a/doc/fr/autogen/user/logger_commands.txt +++ b/doc/fr/autogen/user/logger_commands.txt @@ -3,11 +3,13 @@ ........................................ /logger list set + flush disable list: afficher le statut d'enregistrement pour les tampons ouverts set: définir le niveau d'enregistrement pour le tampon courant niveau: niveau pour les messages à enregistrer (0 = pas d'enregistrement, 1 = quelques messages (les plus importants) .. 9 = tous les messages) + flush: écrire tous les fichiers de log maintenant disable: désactiver l'enregistrement pour le tampon courant (définir le niveau à 0) Les options "logger.level.*" et "logger.mask.*" peuvent être utilisées pour définir le niveau ou le masque de nom de fichier pour un tampon, ou plusieurs tampons commençant par un nom. diff --git a/doc/it/autogen/user/logger_commands.txt b/doc/it/autogen/user/logger_commands.txt index 2f48b0790..97fa47998 100644 --- a/doc/it/autogen/user/logger_commands.txt +++ b/doc/it/autogen/user/logger_commands.txt @@ -2,33 +2,35 @@ [command]*`logger`* configurazione del plugin logger:: ........................................ /logger list - set + set + flush disable - list: mostra lo stato del logging per i buffer aperti - set: imposta il livello di logging per il buffer corrente - level: livello per i messaggi da loggare (0 = disabilitato, 1 = alcuni messaggi (più importanti) .. 9 = tutti i messaggi) -disable: disabilita il logging sul buffer corrente (imposta livello a 0) + list: show logging status for opened buffers + set: set logging level on current buffer + level: level for messages to be logged (0 = logging disabled, 1 = a few messages (most important) .. 9 = all messages) + flush: write all log files now +disable: disable logging on current buffer (set level to 0) -Le opzioni "logger.level.*" e "logger.mask.*" possono essere usate per impostare un livello o una mask per un buffer, o per i buffer che cominciano per nome. +Options "logger.level.*" and "logger.mask.*" can be used to set level or mask for a buffer, or buffers beginning with name. -Livelli di log usati dal plugin IRC: - 1: messaggio utente, notifica, privato - 2: cambio di nick - 3: messaggio del server - 4: entrata/uscita/abbandono - 9: tutti gli altri messaggi +Log levels used by IRC plugin: + 1: user message, notice, private + 2: nick change + 3: server message + 4: join/part/quit + 9: all other messages -Esempi: - imposta il livello 5 per buffer corrente: +Examples: + set level to 5 for current buffer: /logger set 5 - disabilita logging per il buffer corrente: + disable logging for current buffer: /logger disable - imposta il livello 3 per tutti i buffer IRC: + set level to 3 for all IRC buffers: /set logger.level.irc 3 - disabilita logging per il buffer principale di WeeChat: + disable logging for main WeeChat buffer: /set logger.level.core.weechat 0 - usa una directory per il server IRC e un file per ogni canale al suo interno: + use a directory per IRC server and a file per channel inside: /set logger.mask.irc "$server/$channel.weechatlog" ........................................ diff --git a/doc/ja/autogen/user/logger_commands.txt b/doc/ja/autogen/user/logger_commands.txt index 055c2a5ff..54e3ce590 100644 --- a/doc/ja/autogen/user/logger_commands.txt +++ b/doc/ja/autogen/user/logger_commands.txt @@ -3,32 +3,34 @@ ........................................ /logger list set + flush disable - list: オープンされたバッファのログ保存設定を表示 - set: 現在のバッファのログ保存レベルを設定 - level: ログ保存されるメッセージのレベル (0 = ログ保存しない、1 = いくつかのメッセージ (最も重要) .. 9 = 全てのメッセージ) -disable: 現在のバッファのログ保存を無効化 (レベルを 0 に設定) + list: show logging status for opened buffers + set: set logging level on current buffer + level: level for messages to be logged (0 = logging disabled, 1 = a few messages (most important) .. 9 = all messages) + flush: write all log files now +disable: disable logging on current buffer (set level to 0) -オプション "logger.level.*" と "logger.mask.*" は任意のバッファに対するログレベルとログ保存先の設定を意味します。 +Options "logger.level.*" and "logger.mask.*" can be used to set level or mask for a buffer, or buffers beginning with name. -IRC プラグインで使われるログレベル: - 1: ユーザメッセージ、通知、プライベート - 2: ニックネームの変更 - 3: サーバメッセージ - 4: 参加/退出/終了 - 9: その他の全てのメッセージ +Log levels used by IRC plugin: + 1: user message, notice, private + 2: nick change + 3: server message + 4: join/part/quit + 9: all other messages -例: - 現在のバッファのレベルを 5 に設定: +Examples: + set level to 5 for current buffer: /logger set 5 - 現在のバッファのログ保存を無効化: + disable logging for current buffer: /logger disable - 全ての IRC バッファのレベルを 3 に設定: + set level to 3 for all IRC buffers: /set logger.level.irc 3 - メインの WeeChat バッファのログ保存を無効化: + disable logging for main WeeChat buffer: /set logger.level.core.weechat 0 - IRC サーバごとのディレクトリ、チャンネルごとのファイルを使う: + use a directory per IRC server and a file per channel inside: /set logger.mask.irc "$server/$channel.weechatlog" ........................................ diff --git a/po/cs.po b/po/cs.po index 692a07ae5..251fd0e1e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-25 12:37+0200\n" +"POT-Creation-Date: 2013-08-26 18:19+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -7501,14 +7501,17 @@ msgstr "===\t========== Konec zpětného logu (%d řádků) ==========" msgid "logger plugin configuration" msgstr "konfigurace logovacího pluginu" -msgid "list || set || disable" +#, fuzzy +msgid "list || set || flush || disable" msgstr "list || set <úroveň> || disable" +#, fuzzy msgid "" " list: show logging status for opened buffers\n" " set: set logging level on current buffer\n" " level: level for messages to be logged (0 = logging disabled, 1 = a few " "messages (most important) .. 9 = all messages)\n" +" flush: write all log files now\n" "disable: disable logging on current buffer (set level to 0)\n" "\n" "Options \"logger.level.*\" and \"logger.mask.*\" can be used to set level or " diff --git a/po/de.po b/po/de.po index f8b36e544..934cb704d 100644 --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-25 12:37+0200\n" +"POT-Creation-Date: 2013-08-26 18:19+0200\n" "PO-Revision-Date: 2013-08-18 19:01+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -8328,14 +8328,17 @@ msgstr "" "Konfiguration für \"logger\" Erweiterung (dient zum protokollieren der " "Buffer)" -msgid "list || set || disable" +#, fuzzy +msgid "list || set || flush || disable" msgstr "list || set || disable" +#, fuzzy msgid "" " list: show logging status for opened buffers\n" " set: set logging level on current buffer\n" " level: level for messages to be logged (0 = logging disabled, 1 = a few " "messages (most important) .. 9 = all messages)\n" +" flush: write all log files now\n" "disable: disable logging on current buffer (set level to 0)\n" "\n" "Options \"logger.level.*\" and \"logger.mask.*\" can be used to set level or " diff --git a/po/es.po b/po/es.po index d92929e39..9d85d3969 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-25 12:37+0200\n" +"POT-Creation-Date: 2013-08-26 18:19+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -7772,14 +7772,17 @@ msgstr "%s===\t%s========== Fin del último registro (%d líneas) ==========" msgid "logger plugin configuration" msgstr "configuración del plugin de registro" -msgid "list || set || disable" +#, fuzzy +msgid "list || set || flush || disable" msgstr "list || set || disable" +#, fuzzy msgid "" " list: show logging status for opened buffers\n" " set: set logging level on current buffer\n" " level: level for messages to be logged (0 = logging disabled, 1 = a few " "messages (most important) .. 9 = all messages)\n" +" flush: write all log files now\n" "disable: disable logging on current buffer (set level to 0)\n" "\n" "Options \"logger.level.*\" and \"logger.mask.*\" can be used to set level or " diff --git a/po/fr.po b/po/fr.po index 72ce63c28..4f5391092 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-25 12:37+0200\n" -"PO-Revision-Date: 2013-08-25 12:38+0200\n" +"POT-Creation-Date: 2013-08-26 18:19+0200\n" +"PO-Revision-Date: 2013-08-26 18:19+0200\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -8094,14 +8094,15 @@ msgstr "%s===\t%s========== Fin de l'historique (%d lignes) ==========" msgid "logger plugin configuration" msgstr "configuration de l'extension logger" -msgid "list || set || disable" -msgstr "list || set || disable" +msgid "list || set || flush || disable" +msgstr "list || set || flush || disable" msgid "" " list: show logging status for opened buffers\n" " set: set logging level on current buffer\n" " level: level for messages to be logged (0 = logging disabled, 1 = a few " "messages (most important) .. 9 = all messages)\n" +" flush: write all log files now\n" "disable: disable logging on current buffer (set level to 0)\n" "\n" "Options \"logger.level.*\" and \"logger.mask.*\" can be used to set level or " @@ -8130,6 +8131,7 @@ msgstr "" " set: définir le niveau d'enregistrement pour le tampon courant\n" " niveau: niveau pour les messages à enregistrer (0 = pas d'enregistrement, 1 " "= quelques messages (les plus importants) .. 9 = tous les messages)\n" +" flush: écrire tous les fichiers de log maintenant\n" "disable: désactiver l'enregistrement pour le tampon courant (définir le " "niveau à 0)\n" "\n" diff --git a/po/hu.po b/po/hu.po index fe8688209..34b656d76 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-25 12:37+0200\n" +"POT-Creation-Date: 2013-08-26 18:19+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -6993,7 +6993,7 @@ msgstr "" msgid "logger plugin configuration" msgstr "Beállítások mentése a lemezre\n" -msgid "list || set || disable" +msgid "list || set || flush || disable" msgstr "" msgid "" @@ -7001,6 +7001,7 @@ msgid "" " set: set logging level on current buffer\n" " level: level for messages to be logged (0 = logging disabled, 1 = a few " "messages (most important) .. 9 = all messages)\n" +" flush: write all log files now\n" "disable: disable logging on current buffer (set level to 0)\n" "\n" "Options \"logger.level.*\" and \"logger.mask.*\" can be used to set level or " diff --git a/po/it.po b/po/it.po index 2084a6b91..c5873f9cb 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-25 12:37+0200\n" +"POT-Creation-Date: 2013-08-26 18:19+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -7841,14 +7841,17 @@ msgstr "%s===\t%s========== Fine della cronologia (%d righe) ==========" msgid "logger plugin configuration" msgstr "configurazione del plugin logger" -msgid "list || set || disable" +#, fuzzy +msgid "list || set || flush || disable" msgstr "list || set || disable" +#, fuzzy msgid "" " list: show logging status for opened buffers\n" " set: set logging level on current buffer\n" " level: level for messages to be logged (0 = logging disabled, 1 = a few " "messages (most important) .. 9 = all messages)\n" +" flush: write all log files now\n" "disable: disable logging on current buffer (set level to 0)\n" "\n" "Options \"logger.level.*\" and \"logger.mask.*\" can be used to set level or " diff --git a/po/ja.po b/po/ja.po index 8b90012cd..d42703c0f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-25 12:37+0200\n" +"POT-Creation-Date: 2013-08-26 18:19+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -7729,14 +7729,17 @@ msgstr "%s===\t%s========== バックログの最後 (%d 行) ==========" msgid "logger plugin configuration" msgstr "logger プラグイン設定" -msgid "list || set || disable" +#, fuzzy +msgid "list || set || flush || disable" msgstr "list || set || disable" +#, fuzzy msgid "" " list: show logging status for opened buffers\n" " set: set logging level on current buffer\n" " level: level for messages to be logged (0 = logging disabled, 1 = a few " "messages (most important) .. 9 = all messages)\n" +" flush: write all log files now\n" "disable: disable logging on current buffer (set level to 0)\n" "\n" "Options \"logger.level.*\" and \"logger.mask.*\" can be used to set level or " diff --git a/po/pl.po b/po/pl.po index 0e525ca83..66e59774b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-25 12:37+0200\n" +"POT-Creation-Date: 2013-08-26 18:19+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -7871,14 +7871,17 @@ msgstr "%s===\t%s========== Koniec backloga (%d linii) ==========" msgid "logger plugin configuration" msgstr "konfiguracja wtyczki logera" -msgid "list || set || disable" +#, fuzzy +msgid "list || set || flush || disable" msgstr "list || set || disable" +#, fuzzy msgid "" " list: show logging status for opened buffers\n" " set: set logging level on current buffer\n" " level: level for messages to be logged (0 = logging disabled, 1 = a few " "messages (most important) .. 9 = all messages)\n" +" flush: write all log files now\n" "disable: disable logging on current buffer (set level to 0)\n" "\n" "Options \"logger.level.*\" and \"logger.mask.*\" can be used to set level or " diff --git a/po/pt_BR.po b/po/pt_BR.po index aa1927ed2..ffe362f55 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-25 12:37+0200\n" +"POT-Creation-Date: 2013-08-26 18:19+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" @@ -7211,7 +7211,8 @@ msgstr "===\t========== Fim do backlog (%d linhas) ==========" msgid "logger plugin configuration" msgstr "configuração do plugin de registro" -msgid "list || set || disable" +#, fuzzy +msgid "list || set || flush || disable" msgstr "list || set || disable" msgid "" @@ -7219,6 +7220,7 @@ msgid "" " set: set logging level on current buffer\n" " level: level for messages to be logged (0 = logging disabled, 1 = a few " "messages (most important) .. 9 = all messages)\n" +" flush: write all log files now\n" "disable: disable logging on current buffer (set level to 0)\n" "\n" "Options \"logger.level.*\" and \"logger.mask.*\" can be used to set level or " diff --git a/po/ru.po b/po/ru.po index 22faf35db..3e65b79d4 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-25 12:37+0200\n" +"POT-Creation-Date: 2013-08-26 18:19+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -7022,7 +7022,7 @@ msgstr "" msgid "logger plugin configuration" msgstr "Сохраняю конфигурацию\n" -msgid "list || set || disable" +msgid "list || set || flush || disable" msgstr "" msgid "" @@ -7030,6 +7030,7 @@ msgid "" " set: set logging level on current buffer\n" " level: level for messages to be logged (0 = logging disabled, 1 = a few " "messages (most important) .. 9 = all messages)\n" +" flush: write all log files now\n" "disable: disable logging on current buffer (set level to 0)\n" "\n" "Options \"logger.level.*\" and \"logger.mask.*\" can be used to set level or " diff --git a/po/tr.po b/po/tr.po index 33b954f19..fade43484 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-25 12:37+0200\n" +"POT-Creation-Date: 2013-08-26 18:19+0200\n" "PO-Revision-Date: 2013-08-17 10:37+0200\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -6237,7 +6237,8 @@ msgstr "" msgid "logger plugin configuration" msgstr "" -msgid "list || set || disable" +#, fuzzy +msgid "list || set || flush || disable" msgstr "list || set || disable" msgid "" @@ -6245,6 +6246,7 @@ msgid "" " set: set logging level on current buffer\n" " level: level for messages to be logged (0 = logging disabled, 1 = a few " "messages (most important) .. 9 = all messages)\n" +" flush: write all log files now\n" "disable: disable logging on current buffer (set level to 0)\n" "\n" "Options \"logger.level.*\" and \"logger.mask.*\" can be used to set level or " diff --git a/po/weechat.pot b/po/weechat.pot index b1db1765c..0134b6bb1 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-25 12:37+0200\n" +"POT-Creation-Date: 2013-08-26 18:19+0200\n" "PO-Revision-Date: 2013-02-14 18:20+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: weechat-dev \n" @@ -6201,7 +6201,7 @@ msgstr "" msgid "logger plugin configuration" msgstr "" -msgid "list || set || disable" +msgid "list || set || flush || disable" msgstr "" msgid "" @@ -6209,6 +6209,7 @@ msgid "" " set: set logging level on current buffer\n" " level: level for messages to be logged (0 = logging disabled, 1 = a few " "messages (most important) .. 9 = all messages)\n" +" flush: write all log files now\n" "disable: disable logging on current buffer (set level to 0)\n" "\n" "Options \"logger.level.*\" and \"logger.mask.*\" can be used to set level or " diff --git a/src/plugins/logger/logger.c b/src/plugins/logger/logger.c index 8be65132a..81cbad5a5 100644 --- a/src/plugins/logger/logger.c +++ b/src/plugins/logger/logger.c @@ -827,6 +827,34 @@ logger_set_buffer (struct t_gui_buffer *buffer, const char *value) free (name); } +/* + * Flushes all log files. + */ + +void +logger_flush () +{ + struct t_logger_buffer *ptr_logger_buffer; + + for (ptr_logger_buffer = logger_buffers; ptr_logger_buffer; + ptr_logger_buffer = ptr_logger_buffer->next_buffer) + { + if (ptr_logger_buffer->log_file && ptr_logger_buffer->flush_needed) + { + if (weechat_logger_plugin->debug >= 2) + { + weechat_printf_tags (NULL, + "no_log", + "%s: flush file %s", + LOGGER_PLUGIN_NAME, + ptr_logger_buffer->log_filename); + } + fflush (ptr_logger_buffer->log_file); + ptr_logger_buffer->flush_needed = 0; + } + } +} + /* * Callback for command "/logger". */ @@ -855,6 +883,12 @@ logger_command_cb (void *data, struct t_gui_buffer *buffer, return WEECHAT_RC_OK; } + if (weechat_strcasecmp (argv[1], "flush") == 0) + { + logger_flush (); + return WEECHAT_RC_OK; + } + if (weechat_strcasecmp (argv[1], "disable") == 0) { logger_set_buffer (buffer, "0"); @@ -1252,29 +1286,11 @@ logger_print_cb (void *data, struct t_gui_buffer *buffer, time_t date, int logger_timer_cb (void *data, int remaining_calls) { - struct t_logger_buffer *ptr_logger_buffer; - /* make C compiler happy */ (void) data; (void) remaining_calls; - for (ptr_logger_buffer = logger_buffers; ptr_logger_buffer; - ptr_logger_buffer = ptr_logger_buffer->next_buffer) - { - if (ptr_logger_buffer->log_file && ptr_logger_buffer->flush_needed) - { - if (weechat_logger_plugin->debug >= 2) - { - weechat_printf_tags (NULL, - "no_log", - "%s: flush file %s", - LOGGER_PLUGIN_NAME, - ptr_logger_buffer->log_filename); - } - fflush (ptr_logger_buffer->log_file); - ptr_logger_buffer->flush_needed = 0; - } - } + logger_flush (); return WEECHAT_RC_OK; } @@ -1303,12 +1319,14 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) N_("logger plugin configuration"), N_("list" " || set " + " || flush" " || disable"), N_(" list: show logging status for opened buffers\n" " set: set logging level on current buffer\n" " level: level for messages to be logged (0 = " "logging disabled, 1 = a few messages (most " "important) .. 9 = all messages)\n" + " flush: write all log files now\n" "disable: disable logging on current buffer (set " "level to 0)\n\n" "Options \"logger.level.*\" and \"logger.mask.*\" " @@ -1334,6 +1352,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) " /set logger.mask.irc \"$server/$channel.weechatlog\""), "list" " || set 1|2|3|4|5|6|7|8|9" + " || flush" " || disable", &logger_command_cb, NULL);