irc: rename option irc.network.lag_disconnect to irc.network.lag_reconnect, value is now a number of seconds

v2.8-utf8proc
Sebastien Helleu 2013-03-12 18:35:03 +01:00
parent afc1dd4f6b
commit 7cf9c8a656
21 changed files with 125 additions and 80 deletions

View File

@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
v0.4.1-dev, 2013-03-11
v0.4.1-dev, 2013-03-12
This document lists all changes for each version.
@ -41,6 +41,8 @@ Version 0.4.1 (under dev!)
list with arguments inside), guile >= 2.0 is now required (bug #38350)
* guile: fix crash on calls to callbacks during load of script (bug #38343)
* guile: fix compilation with guile 2.0
* irc: rename option irc.network.lag_disconnect to irc.network.lag_reconnect,
value is now a number of seconds
* irc: hide passwords in commands or messages sent to nickserv (/msg nickserv)
with new modifiers "irc_command_auth" and "irc_message_auth", remove option
irc.look.hide_nickserv_pwd, add option irc.look.nicks_hide_password

7
NEWS
View File

@ -1,7 +1,7 @@
WeeChat Release Notes
=====================
Sébastien Helleu <flashcode@flashtux.org>
v0.4.1-dev, 2013-02-26
v0.4.1-dev, 2013-03-12
This document lists important changes for each version, that require manual
@ -16,6 +16,11 @@ http://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
Version 0.4.1 (under dev!)
--------------------------
=== IRC reconnection on important lag ===
Option 'irc.network.lag_disconnect' has been renamed to
'irc.network.lag_reconnect' and value is now a number of seconds.
=== IRC passwords hidden ===
IRC plugin is now using modifiers "irc_command_auth" and "irc_message_auth" to

View File

@ -353,16 +353,16 @@
** Typ: integer
** Werte: 0 .. 604800 (Standardwert: `60`)
* [[option_irc.network.lag_disconnect]] *irc.network.lag_disconnect*
** Beschreibung: `maximal Verzögerung (Lag) bis zum Trennen der Verbindung (in Minuten - 0 = niemals trennen)`
** Typ: integer
** Werte: 0 .. 10080 (Standardwert: `0`)
* [[option_irc.network.lag_min_show]] *irc.network.lag_min_show*
** Beschreibung: `geringste Verzögerungszeit (Lag) die angezeigt werden soll (in Millisekunden)`
** Typ: integer
** Werte: 0 .. 86400000 (Standardwert: `500`)
* [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
** Beschreibung: `reconnect to server if lag is greater than this value (in seconds, 0 = never reconnect)`
** Typ: integer
** Werte: 0 .. 604800 (Standardwert: `0`)
* [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
** Beschreibung: `Intervall zwischen zwei Aktualisierungen der Verzögerungsanzeige (Lag-Item), wenn die Verzögerungszeit sich erhöht (in Sekunden)`
** Typ: integer

View File

@ -353,16 +353,16 @@
** type: integer
** values: 0 .. 604800 (default value: `60`)
* [[option_irc.network.lag_disconnect]] *irc.network.lag_disconnect*
** description: `disconnect after important lag (in minutes, 0 = never disconnect)`
** type: integer
** values: 0 .. 10080 (default value: `0`)
* [[option_irc.network.lag_min_show]] *irc.network.lag_min_show*
** description: `minimum lag to show (in milliseconds)`
** type: integer
** values: 0 .. 86400000 (default value: `500`)
* [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
** description: `reconnect to server if lag is greater than this value (in seconds, 0 = never reconnect)`
** type: integer
** values: 0 .. 604800 (default value: `0`)
* [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
** description: `interval between two refreshs of lag item, when lag is increasing (in seconds)`
** type: integer

View File

@ -353,16 +353,16 @@
** type: entier
** valeurs: 0 .. 604800 (valeur par défaut: `60`)
* [[option_irc.network.lag_disconnect]] *irc.network.lag_disconnect*
** description: `déconnexion après un lag important (en minutes, 0 = ne jamais se déconnecter)`
** type: entier
** valeurs: 0 .. 10080 (valeur par défaut: `0`)
* [[option_irc.network.lag_min_show]] *irc.network.lag_min_show*
** description: `lag minimum à afficher (en millisecondes)`
** type: entier
** valeurs: 0 .. 86400000 (valeur par défaut: `500`)
* [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
** description: `se reconnecter au serveur si le lag est supérieur à cette valeur (en secondes, 0 = ne jamais se reconnecter)`
** type: entier
** valeurs: 0 .. 604800 (valeur par défaut: `0`)
* [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
** description: `intervalle entre deux rafraichissements du lag, lorsque le lag augmente (en secondes)`
** type: entier

View File

@ -353,16 +353,16 @@
** tipo: intero
** valori: 0 .. 604800 (valore predefinito: `60`)
* [[option_irc.network.lag_disconnect]] *irc.network.lag_disconnect*
** descrizione: `disconnetti dopo un ritardo eccessivo (in minuti, 0 = nessuna disconnessione)`
** tipo: intero
** valori: 0 .. 10080 (valore predefinito: `0`)
* [[option_irc.network.lag_min_show]] *irc.network.lag_min_show*
** descrizione: `ritardo minimo da visualizzare (in millisecondi)`
** tipo: intero
** valori: 0 .. 86400000 (valore predefinito: `500`)
* [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
** descrizione: `reconnect to server if lag is greater than this value (in seconds, 0 = never reconnect)`
** tipo: intero
** valori: 0 .. 604800 (valore predefinito: `0`)
* [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
** descrizione: `intervallo tra due aggiornamenti per l'elemento ritardo, quando è in aumento (in secondi)`
** tipo: intero

View File

@ -353,16 +353,16 @@
** タイプ: 整数
** 値: 0 .. 604800 (デフォルト値: `60`)
* [[option_irc.network.lag_disconnect]] *irc.network.lag_disconnect*
** 説明: `長い遅延の後は再接続 (分単位、0 = 再接続しない)`
** タイプ: 整数
** 値: 0 .. 10080 (デフォルト値: `0`)
* [[option_irc.network.lag_min_show]] *irc.network.lag_min_show*
** 説明: `表示する最短の遅延 (ミリ秒単位)`
** タイプ: 整数
** 値: 0 .. 86400000 (デフォルト値: `500`)
* [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
** 説明: `reconnect to server if lag is greater than this value (in seconds, 0 = never reconnect)`
** タイプ: 整数
** 値: 0 .. 604800 (デフォルト値: `0`)
* [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
** 説明: `遅延時間が増加する場合、遅延アイテムの 2 回のリフレッシュの間のインターバル (秒単位)`
** タイプ: 整数

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-03-10 08:54+0100\n"
"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6226,7 +6226,10 @@ msgstr ""
msgid "minimum lag to show (in milliseconds)"
msgstr "minimální lag, který zobrazit (v milisekundách)"
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
#, fuzzy
msgid ""
"reconnect to server if lag is greater than this value (in seconds, 0 = never "
"reconnect)"
msgstr "odpojit po závažném lagu (v minutách, 0 = nikny neodpojit)"
msgid ""
@ -6917,7 +6920,7 @@ msgid "%s%s: sasl authentication timeout"
msgstr "%s%s: vypršel čas pro sasl autentizaci"
#, fuzzy, c-format
msgid "%s%s: lag is high, disconnecting from server..."
msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s: zpoždění je veliké, odpojuji se od serveru..."
#, fuzzy, c-format

View File

@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-03-11 11:28+0100\n"
"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-03-10 09:40+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@ -6894,7 +6894,10 @@ msgid "minimum lag to show (in milliseconds)"
msgstr ""
"geringste Verzögerungszeit (Lag) die angezeigt werden soll (in Millisekunden)"
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
#, fuzzy
msgid ""
"reconnect to server if lag is greater than this value (in seconds, 0 = never "
"reconnect)"
msgstr ""
"maximal Verzögerung (Lag) bis zum Trennen der Verbindung (in Minuten - 0 = "
"niemals trennen)"
@ -7599,8 +7602,8 @@ msgstr ""
msgid "%s%s: sasl authentication timeout"
msgstr "%s%s: Zeitüberschreitung bei SASL Authentifizierung"
#, c-format
msgid "%s%s: lag is high, disconnecting from server..."
#, fuzzy, c-format
msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s%s: Verzögerung ist zu hoch, die Verbindung wird getrennt..."
#, c-format

View File

@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-03-10 08:54+0100\n"
"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6480,7 +6480,10 @@ msgstr ""
msgid "minimum lag to show (in milliseconds)"
msgstr "retraso mínimo a mostrar (en milisegundos)"
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
#, fuzzy
msgid ""
"reconnect to server if lag is greater than this value (in seconds, 0 = never "
"reconnect)"
msgstr ""
"desconexión tras un retraso importante (en minutos, 0 = no desconectar nunca)"
@ -7166,8 +7169,8 @@ msgstr "%s%s: tiempo de conexión agotado (mensaje 001 no recibido)"
msgid "%s%s: sasl authentication timeout"
msgstr "%s%s: la autenticación SASL agotó el tiempo de espera"
#, c-format
msgid "%s%s: lag is high, disconnecting from server..."
#, fuzzy, c-format
msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s%s: el retraso es alto, desconectando del servidor..."
#, c-format

View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-03-10 08:54+0100\n"
"PO-Revision-Date: 2013-03-10 08:54+0100\n"
"POT-Creation-Date: 2013-03-12 18:32+0100\n"
"PO-Revision-Date: 2013-03-12 13:54+0100\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@ -6692,9 +6692,12 @@ msgstr ""
msgid "minimum lag to show (in milliseconds)"
msgstr "lag minimum à afficher (en millisecondes)"
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
msgid ""
"reconnect to server if lag is greater than this value (in seconds, 0 = never "
"reconnect)"
msgstr ""
"déconnexion après un lag important (en minutes, 0 = ne jamais se déconnecter)"
"se reconnecter au serveur si le lag est supérieur à cette valeur (en "
"secondes, 0 = ne jamais se reconnecter)"
msgid ""
"interval between two refreshs of lag item, when lag is increasing (in "
@ -7382,8 +7385,8 @@ msgid "%s%s: sasl authentication timeout"
msgstr "%s%s: délai d'authentification sasl dépassé"
#, c-format
msgid "%s%s: lag is high, disconnecting from server..."
msgstr "%s%s: le lag est élevé, déconnexion du serveur..."
msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s%s: le lag est élevé, reconnexion au serveur %s%s%s"
#, c-format
msgid "%s%s: reconnecting to server in %d %s, %d %s"

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-03-10 08:54+0100\n"
"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5760,7 +5760,10 @@ msgstr "két távollétellenőrzés közti idő (percben, 0 = nincs ellenőrzés
msgid "minimum lag to show (in milliseconds)"
msgstr "minimális kijelzett késés (másodpercben)"
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
#, fuzzy
msgid ""
"reconnect to server if lag is greater than this value (in seconds, 0 = never "
"reconnect)"
msgstr "lekapcsolódás túl nagy késés esetén (percben, 0 = nincs lecsatlakozás)"
#, fuzzy
@ -6446,7 +6449,7 @@ msgid "%s%s: sasl authentication timeout"
msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
#, fuzzy, c-format
msgid "%s%s: lag is high, disconnecting from server..."
msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s túl nagy a késés(lag), lecsatlakozás a szerverről...\n"
#, fuzzy, c-format

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-03-10 08:54+0100\n"
"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6502,7 +6502,10 @@ msgstr ""
msgid "minimum lag to show (in milliseconds)"
msgstr "ritardo minimo da visualizzare (in millisecondi)"
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
#, fuzzy
msgid ""
"reconnect to server if lag is greater than this value (in seconds, 0 = never "
"reconnect)"
msgstr ""
"disconnetti dopo un ritardo eccessivo (in minuti, 0 = nessuna disconnessione)"
@ -7186,8 +7189,8 @@ msgstr "%s%s: timeout della connessione (messaggio 001 non ricevuto)"
msgid "%s%s: sasl authentication timeout"
msgstr "%s%s: timeout dell'autenticazione sasl"
#, c-format
msgid "%s%s: lag is high, disconnecting from server..."
#, fuzzy, c-format
msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s%s: ritardo eccessivo, disconnessione dal server..."
#, c-format

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-03-10 08:54+0100\n"
"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@ -6441,7 +6441,10 @@ msgstr "遅延の確認間のインターバル (秒単位、0 = 確認しない
msgid "minimum lag to show (in milliseconds)"
msgstr "表示する最短の遅延 (ミリ秒単位)"
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
#, fuzzy
msgid ""
"reconnect to server if lag is greater than this value (in seconds, 0 = never "
"reconnect)"
msgstr "長い遅延の後は再接続 (分単位、0 = 再接続しない)"
msgid ""
@ -7119,8 +7122,8 @@ msgstr "%s%s: 接続タイムアウト (メッセージ 001 が受信されま
msgid "%s%s: sasl authentication timeout"
msgstr "%s%s: sasl 認証タイムアウト"
#, c-format
msgid "%s%s: lag is high, disconnecting from server..."
#, fuzzy, c-format
msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s%s: ラグが長いです、サーバとの接続を切断中..."
#, c-format

View File

@ -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-03-10 08:54+0100\n"
"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6577,7 +6577,10 @@ msgstr ""
msgid "minimum lag to show (in milliseconds)"
msgstr "minimalne pokazywane opóźnienie (w milisekundach)"
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
#, fuzzy
msgid ""
"reconnect to server if lag is greater than this value (in seconds, 0 = never "
"reconnect)"
msgstr "rozłącz po dużym opóźnieniu (w minutach, 0 = nie rozłączaj nigdy)"
msgid ""
@ -7257,8 +7260,8 @@ msgstr "%s%s: przekroczono czas połączenia (nie otrzymano wiadomości 001)"
msgid "%s%s: sasl authentication timeout"
msgstr "%s%s: przekroczono czas uwierzytelniania sasl"
#, c-format
msgid "%s%s: lag is high, disconnecting from server..."
#, fuzzy, c-format
msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s%s: za duże opóźnienie, rozłączam z serwerem..."
#, c-format

View File

@ -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-03-10 08:54+0100\n"
"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-23 11:12+0100\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5933,8 +5933,13 @@ msgstr ""
msgid "minimum lag to show (in milliseconds)"
msgstr ""
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
#, fuzzy
msgid ""
"reconnect to server if lag is greater than this value (in seconds, 0 = never "
"reconnect)"
msgstr ""
"intervalo entre duas verificações de ausente (em minutos, 0 = nunca "
"verificar)"
msgid ""
"interval between two refreshs of lag item, when lag is increasing (in "
@ -6612,7 +6617,7 @@ msgid "%s%s: sasl authentication timeout"
msgstr "%s%s: tempo de autenticação sasl esgotado"
#, fuzzy, c-format
msgid "%s%s: lag is high, disconnecting from server..."
msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s: desconectando do servidor..."
#, fuzzy, c-format

View File

@ -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-03-10 08:54+0100\n"
"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-23 11:12+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5782,7 +5782,10 @@ msgstr ""
msgid "minimum lag to show (in milliseconds)"
msgstr "минимальная отображаемая задержка (в секундах)"
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
#, fuzzy
msgid ""
"reconnect to server if lag is greater than this value (in seconds, 0 = never "
"reconnect)"
msgstr ""
"отключаться при серьёзной задержке (в минутах, 0 = не отключаться никогда)"
@ -6476,7 +6479,7 @@ msgid "%s%s: sasl authentication timeout"
msgstr "Не могу записать лог-файл \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: lag is high, disconnecting from server..."
msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s задержка слишком высокая, отключаюсь от сервера...\n"
#, fuzzy, c-format

View File

@ -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-03-10 08:54+0100\n"
"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-14 18:20+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5022,7 +5022,9 @@ msgstr ""
msgid "minimum lag to show (in milliseconds)"
msgstr ""
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
msgid ""
"reconnect to server if lag is greater than this value (in seconds, 0 = never "
"reconnect)"
msgstr ""
msgid ""
@ -5669,7 +5671,7 @@ msgid "%s%s: sasl authentication timeout"
msgstr ""
#, c-format
msgid "%s%s: lag is high, disconnecting from server..."
msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr ""
#, c-format

View File

@ -126,7 +126,7 @@ struct t_config_option *irc_config_network_colors_receive;
struct t_config_option *irc_config_network_colors_send;
struct t_config_option *irc_config_network_lag_check;
struct t_config_option *irc_config_network_lag_min_show;
struct t_config_option *irc_config_network_lag_disconnect;
struct t_config_option *irc_config_network_lag_reconnect;
struct t_config_option *irc_config_network_lag_refresh_interval;
struct t_config_option *irc_config_network_notify_check_ison;
struct t_config_option *irc_config_network_notify_check_whois;
@ -2552,12 +2552,12 @@ irc_config_init ()
N_("minimum lag to show (in milliseconds)"),
NULL, 0, 1000 * 3600 * 24, "500", NULL, 0, NULL, NULL,
&irc_config_change_network_lag_min_show, NULL, NULL, NULL);
irc_config_network_lag_disconnect = weechat_config_new_option (
irc_config_network_lag_reconnect = weechat_config_new_option (
irc_config_file, ptr_section,
"lag_disconnect", "integer",
N_("disconnect after important lag (in minutes, 0 = never "
"disconnect)"),
NULL, 0, 60 * 24 * 7, "0", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
"lag_reconnect", "integer",
N_("reconnect to server if lag is greater than this value (in seconds, "
"0 = never reconnect)"),
NULL, 0, 3600 * 24 * 7, "0", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_network_lag_refresh_interval = weechat_config_new_option (
irc_config_file, ptr_section,
"lag_refresh_interval", "integer",

View File

@ -157,7 +157,7 @@ extern struct t_config_option *irc_config_network_colors_receive;
extern struct t_config_option *irc_config_network_colors_send;
extern struct t_config_option *irc_config_network_lag_check;
extern struct t_config_option *irc_config_network_lag_min_show;
extern struct t_config_option *irc_config_network_lag_disconnect;
extern struct t_config_option *irc_config_network_lag_reconnect;
extern struct t_config_option *irc_config_network_lag_refresh_interval;
extern struct t_config_option *irc_config_network_notify_check_ison;
extern struct t_config_option *irc_config_network_notify_check_whois;

View File

@ -47,6 +47,7 @@
#include "irc-server.h"
#include "irc-buffer.h"
#include "irc-channel.h"
#include "irc-color.h"
#include "irc-command.h"
#include "irc-config.h"
#include "irc-input.h"
@ -2821,14 +2822,17 @@ irc_server_timer_cb (void *data, int remaining_calls)
weechat_bar_item_update ("lag");
}
/* lag timeout? => disconnect */
if ((weechat_config_integer (irc_config_network_lag_disconnect) > 0)
&& (ptr_server->lag / 1000 > weechat_config_integer (irc_config_network_lag_disconnect) * 60))
if ((weechat_config_integer (irc_config_network_lag_reconnect) > 0)
&& (ptr_server->lag / 1000 > weechat_config_integer (irc_config_network_lag_reconnect)))
{
weechat_printf (ptr_server->buffer,
_("%s%s: lag is high, disconnecting "
"from server..."),
_("%s%s: lag is high, reconnecting to "
"server %s%s%s"),
weechat_prefix ("network"),
IRC_PLUGIN_NAME);
IRC_PLUGIN_NAME,
IRC_COLOR_CHAT_SERVER,
ptr_server->name,
IRC_COLOR_RESET);
irc_server_disconnect (ptr_server, 0, 1);
}
}