developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
liyubing
9c452d0b 1 parent 2b58d3c1

feat:1）Logger.debug日志中添加一个动态的prefix参数据，方便打印完整的日志信息

Inline Side-by-side
Showing 1 changed file with 42 additions and 20 deletions
@@ -40,15 +40,10 @@ export class Logger { @@ -40,15 +40,10 @@ export class Logger {
40 Logger.domain = domain; 40 Logger.domain = domain;
41 } 41 }
42 42
43 - static debug(prefixStr?:string,...args: string[]) { 43 + static debug(...args: string[]) {
44 if (!Logger.isDebug) { 44 if (!Logger.isDebug) {
45 return 45 return
46 } 46 }
47 - if(prefixStr){  
48 - Logger.prefix = prefixStr  
49 - }else {  
50 - Logger.prefix = 'SightApp';  
51 - }  
52 Logger.logContent(LogLevel.DEBUG, ...args) 47 Logger.logContent(LogLevel.DEBUG, ...args)
53 } 48 }
54 49
@@ -90,55 +85,68 @@ export class Logger { @@ -90,55 +85,68 @@ export class Logger {
90 85
91 static logContent(level: LogLevel, ...args: string[]) { 86 static logContent(level: LogLevel, ...args: string[]) {
92 let msg = Logger.getMsg(...args) 87 let msg = Logger.getMsg(...args)
  88 + let tag = Logger.getTag(...args)
93 let length = msg.length 89 let length = msg.length
94 if (length < Logger.CHUNK_SIZE) { 90 if (length < Logger.CHUNK_SIZE) {
95 // 不超限，保持原来的打印 91 // 不超限，保持原来的打印
96 - Logger.print(level, ...args) 92 + Logger.print(tag, level, ...args)
97 } else { 93 } else {
98 // 超限，分段打印 94 // 超限，分段打印
99 for (let i = 0; i < length; i += Logger.CHUNK_SIZE) { 95 for (let i = 0; i < length; i += Logger.CHUNK_SIZE) {
100 let count = Math.min(length - i, Logger.CHUNK_SIZE); 96 let count = Math.min(length - i, Logger.CHUNK_SIZE);
101 - Logger.printExt(level, msg.substring(i, i + count)); 97 + Logger.printExt(tag, level, msg.substring(i, i + count));
102 } 98 }
103 } 99 }
104 } 100 }
105 101
106 - static print(level: LogLevel, ...msg: string[]) { 102 + static print(tag: string, level: LogLevel, ...msg: string[]) {
  103 +
  104 + let prefix = Logger.prefix
  105 + if (tag) {
  106 + prefix = tag
  107 + }
  108 +
107 switch (level) { 109 switch (level) {
108 case LogLevel.DEBUG: 110 case LogLevel.DEBUG:
109 - hilog.debug(Logger.domain, Logger.prefix, Logger.format, msg); 111 + hilog.debug(Logger.domain, prefix, Logger.format, msg);
110 break 112 break
111 case LogLevel.INFO: 113 case LogLevel.INFO:
112 - hilog.info(Logger.domain, Logger.prefix, Logger.format, msg); 114 + hilog.info(Logger.domain, prefix, Logger.format, msg);
113 break 115 break
114 case LogLevel.WARN: 116 case LogLevel.WARN:
115 - hilog.warn(Logger.domain, Logger.prefix, Logger.format, msg); 117 + hilog.warn(Logger.domain, prefix, Logger.format, msg);
116 break 118 break
117 case LogLevel.ERROR: 119 case LogLevel.ERROR:
118 - hilog.error(Logger.domain, Logger.prefix, Logger.format, msg); 120 + hilog.error(Logger.domain, prefix, Logger.format, msg);
119 break 121 break
120 case LogLevel.FATAL: 122 case LogLevel.FATAL:
121 - hilog.fatal(Logger.domain, Logger.prefix, Logger.format, msg); 123 + hilog.fatal(Logger.domain, prefix, Logger.format, msg);
122 break 124 break
123 } 125 }
124 } 126 }
125 127
126 - static printExt(level: LogLevel, msg: string) { 128 + static printExt(tag: string, level: LogLevel, msg: string) {
  129 +
  130 + let prefix = Logger.prefix
  131 + if (tag) {
  132 + prefix = tag
  133 + }
  134 +
127 switch (level) { 135 switch (level) {
128 case LogLevel.DEBUG: 136 case LogLevel.DEBUG:
129 - hilog.debug(Logger.domain, Logger.prefix, Logger.format_ext, msg); 137 + hilog.debug(Logger.domain, prefix, Logger.format_ext, msg);
130 break 138 break
131 case LogLevel.INFO: 139 case LogLevel.INFO:
132 - hilog.info(Logger.domain, Logger.prefix, Logger.format_ext, msg); 140 + hilog.info(Logger.domain, prefix, Logger.format_ext, msg);
133 break 141 break
134 case LogLevel.WARN: 142 case LogLevel.WARN:
135 - hilog.warn(Logger.domain, Logger.prefix, Logger.format_ext, msg); 143 + hilog.warn(Logger.domain, prefix, Logger.format_ext, msg);
136 break 144 break
137 case LogLevel.ERROR: 145 case LogLevel.ERROR:
138 - hilog.error(Logger.domain, Logger.prefix, Logger.format_ext, msg); 146 + hilog.error(Logger.domain, prefix, Logger.format_ext, msg);
139 break 147 break
140 case LogLevel.FATAL: 148 case LogLevel.FATAL:
141 - hilog.fatal(Logger.domain, Logger.prefix, Logger.format_ext, msg); 149 + hilog.fatal(Logger.domain, prefix, Logger.format_ext, msg);
142 break 150 break
143 } 151 }
144 } 152 }
@@ -153,6 +161,20 @@ export class Logger { @@ -153,6 +161,20 @@ export class Logger {
153 }) 161 })
154 return msg.substring(2, msg.length); 162 return msg.substring(2, msg.length);
155 } 163 }
  164 +
  165 + static getTag(...args: string[]): string {
  166 + if (args == null || args.length <= 0) {
  167 + return '';
  168 + }
  169 +
  170 + if (args.length > 1) {
  171 +
  172 + return args[0]
  173 + } else {
  174 + return ''
  175 + }
  176 +
  177 + }
156 } 178 }
157 179
158 // export default new Logger('SightApp', 0xFF00) 180 // export default new Logger('SightApp', 0xFF00)