[Ttssh2-commit] [6655] LOGLEVEL を整理

svnno****@sourc***** svnno****@sourc*****
2017年 3月 23日 (木) 21:54:55 JST


Revision: 6655
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6655
Author:   doda
Date:     2017-03-23 21:54:55 +0900 (Thu, 23 Mar 2017)
Log Message:
-----------
LOGLEVEL を整理

・一つだけ動詞で不自然だったので syslog 風に NOTIFY を NOTICE に変更
・WARNING 異常 ERROR 未満が URGENT というのがピンとこなかったので URGENT を廃止

Modified Paths:
--------------
    trunk/installer/release/TERATERM.INI
    trunk/ttssh2/ttxssh/ssh.c
    trunk/ttssh2/ttxssh/ttxssh.h

-------------- next part --------------
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2017-03-23 12:54:48 UTC (rev 6654)
+++ trunk/installer/release/TERATERM.INI	2017-03-23 12:54:55 UTC (rev 6655)
@@ -836,9 +836,8 @@
 ; The default value is disabled(0).
 ;   LOG_LEVEL_FATAL      5
 ;   LOG_LEVEL_ERROR      10
-;   LOG_LEVEL_URGENT     20
 ;   LOG_LEVEL_WARNING    30
-;   LOG_LEVEL_NOTIFY     50
+;   LOG_LEVEL_NOTICE     50
 ;   LOG_LEVEL_INFO       80
 ;   LOG_LEVEL_VERBOSE    100
 ;   LOG_LEVEL_SSHDUMP    200

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-03-23 12:54:48 UTC (rev 6654)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-03-23 12:54:55 UTC (rev 6655)
@@ -5281,7 +5281,7 @@
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, 
 		            "SSH_BUG_DHGEX_LARGE is enabled. DH-GEX group size is limited to 4096. (Original size is %d)",
 			    bits);
-		notify_verbose_message(pvar, tmp, LOG_LEVEL_NOTIFY);
+		notify_verbose_message(pvar, tmp, LOG_LEVEL_NOTICE);
 		bits = 4096;
 	}
 
@@ -5381,7 +5381,7 @@
 	// (3) \x97v\x8B\x81\x82̍ŏ\xAC\x92l\x82͖\x9E\x82\xBD\x82\xB7\x82\xAA\x81A\x97v\x8B\x81\x92l\x82\xE6\x82\xE8\x82͏\xAC\x82\xB3\x82\xA2\x81B\x8Am\x94F\x83_\x83C\x83A\x83\x8D\x83O\x82͏o\x82\xB3\x82Ȃ\xA2\x81B
 		_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE,
 		    "DH-GEX: grp_bits(%d) < kexgex_bits(%d)", grp_bits, pvar->kexgex_bits);
-		notify_verbose_message(pvar, tmpbuf, LOG_LEVEL_NOTIFY);
+		notify_verbose_message(pvar, tmpbuf, LOG_LEVEL_NOTICE);
 #if 1
 		tmpbuf[0] = 0; // no message
 #else

Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h	2017-03-23 12:54:48 UTC (rev 6654)
+++ trunk/ttssh2/ttxssh/ttxssh.h	2017-03-23 12:54:55 UTC (rev 6655)
@@ -325,9 +325,8 @@
 
 #define LOG_LEVEL_FATAL      5
 #define LOG_LEVEL_ERROR      10
-#define LOG_LEVEL_URGENT     20
 #define LOG_LEVEL_WARNING    30
-#define LOG_LEVEL_NOTIFY     50
+#define LOG_LEVEL_NOTICE     50
 #define LOG_LEVEL_INFO       80
 #define LOG_LEVEL_VERBOSE    100
 #define LOG_LEVEL_SSHDUMP    200



Ttssh2-commit メーリングリストの案内