mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	* Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
This commit is contained in:
		@@ -311,12 +311,88 @@
 | 
			
		||||
		</h4>
 | 
			
		||||
		<div class="ui attached table segment">
 | 
			
		||||
			<dl class="dl-horizontal admin-dl-horizontal">
 | 
			
		||||
				{{range .Loggers}}
 | 
			
		||||
				{{range .Loggers.default.SubLogDescriptions}}
 | 
			
		||||
					<dt>{{$.i18n.Tr "admin.config.log_mode"}}</dt>
 | 
			
		||||
					<dd>{{.Mode}}</dd>
 | 
			
		||||
					<dd>{{.Name}} ({{.Provider}})</dd>
 | 
			
		||||
					<dt>{{$.i18n.Tr "admin.config.log_config"}}</dt>
 | 
			
		||||
					<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
 | 
			
		||||
				{{end}}
 | 
			
		||||
				<div class="ui divider"></div>
 | 
			
		||||
				<dt>{{$.i18n.Tr "admin.config.macaron_log_mode"}}</dt>
 | 
			
		||||
				{{if .RedirectMacaronLog}}
 | 
			
		||||
					{{if .Loggers.macaron.SubLogDescriptions}}
 | 
			
		||||
						<dd>{{$.i18n.Tr "admin.config.own_named_logger"}}</dd>
 | 
			
		||||
						{{range .Loggers.macaron.SubLogDescriptions}}
 | 
			
		||||
							<dt>{{$.i18n.Tr "admin.config.log_mode"}}</dt>
 | 
			
		||||
							<dd>{{.Name}} ({{.Provider}})</dd>
 | 
			
		||||
							<dt>{{$.i18n.Tr "admin.config.log_config"}}</dt>
 | 
			
		||||
							<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
 | 
			
		||||
						{{end}}
 | 
			
		||||
					{{else}}
 | 
			
		||||
						<dd>{{$.i18n.Tr "admin.config.routes_to_default_logger"}}</dd>
 | 
			
		||||
					{{end}}
 | 
			
		||||
				{{else}}
 | 
			
		||||
					<dd>{{$.i18n.Tr "admin.config.go_log"}}</dd>
 | 
			
		||||
				{{end}}
 | 
			
		||||
				<div class="ui divider"></div>
 | 
			
		||||
				<dt>{{$.i18n.Tr "admin.config.router_log_mode"}}</dt>
 | 
			
		||||
				{{if .DisableRouterLog}}
 | 
			
		||||
					<dd>{{$.i18n.Tr "admin.config.disabled_logger"}}</dd>
 | 
			
		||||
				{{else}}
 | 
			
		||||
					{{if .RedirectMacaronLog}}
 | 
			
		||||
						{{if .Loggers.router.SubLogDescriptions}}
 | 
			
		||||
							<dd>{{$.i18n.Tr "admin.config.own_named_logger"}}</dd>
 | 
			
		||||
							{{range .Loggers.router.SubLogDescriptions}}
 | 
			
		||||
								<dt>{{$.i18n.Tr "admin.config.log_mode"}}</dt>
 | 
			
		||||
								<dd>{{.Name}} ({{.Provider}})</dd>
 | 
			
		||||
								<dt>{{$.i18n.Tr "admin.config.log_config"}}</dt>
 | 
			
		||||
								<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
 | 
			
		||||
							{{end}}
 | 
			
		||||
						{{else}}
 | 
			
		||||
							<dd>{{$.i18n.Tr "admin.config.routes_to_default_logger"}}</dd>
 | 
			
		||||
						{{end}}
 | 
			
		||||
					{{else}}
 | 
			
		||||
						<dd>{{$.i18n.Tr "admin.config.go_log"}}</dd>
 | 
			
		||||
					{{end}}
 | 
			
		||||
				{{end}}
 | 
			
		||||
				<div class="ui divider"></div>
 | 
			
		||||
				<dt>{{$.i18n.Tr "admin.config.access_log_mode"}}</dt>
 | 
			
		||||
				{{if .EnableAccessLog}}
 | 
			
		||||
					{{if .Loggers.access.SubLogDescriptions}}
 | 
			
		||||
						<dd>{{$.i18n.Tr "admin.config.own_named_logger"}}</dd>
 | 
			
		||||
						{{range .Loggers.access.SubLogDescriptions}}
 | 
			
		||||
							<dt>{{$.i18n.Tr "admin.config.log_mode"}}</dt>
 | 
			
		||||
							<dd>{{.Name}} ({{.Provider}})</dd>
 | 
			
		||||
							<dt>{{$.i18n.Tr "admin.config.log_config"}}</dt>
 | 
			
		||||
							<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
 | 
			
		||||
						{{end}}
 | 
			
		||||
					{{else}}
 | 
			
		||||
						<dd>{{$.i18n.Tr "admin.config.routes_to_default_logger"}}</dd>
 | 
			
		||||
					{{end}}
 | 
			
		||||
					<dt>{{$.i18n.Tr "admin.config.access_log_template"}}</dt>
 | 
			
		||||
					<dd><code>{{$.AccessLogTemplate}}</code></dd>
 | 
			
		||||
				{{else}}
 | 
			
		||||
					<dd>{{$.i18n.Tr "admin.config.disabled_logger"}}</dd>
 | 
			
		||||
				{{end}}
 | 
			
		||||
				<div class="ui divider"></div>
 | 
			
		||||
				<dt>{{$.i18n.Tr "admin.config.xorm_log_mode"}}</dt>
 | 
			
		||||
				{{if .EnableXORMLog}}
 | 
			
		||||
					{{if .Loggers.xorm.SubLogDescriptions}}
 | 
			
		||||
						<dd>{{$.i18n.Tr "admin.config.own_named_logger"}}</dd>
 | 
			
		||||
						{{range .Loggers.xorm.SubLogDescriptions}}
 | 
			
		||||
							<dt>{{$.i18n.Tr "admin.config.log_mode"}}</dt>
 | 
			
		||||
							<dd>{{.Name}} ({{.Provider}})</dd>
 | 
			
		||||
							<dt>{{$.i18n.Tr "admin.config.log_config"}}</dt>
 | 
			
		||||
							<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
 | 
			
		||||
						{{end}}
 | 
			
		||||
					{{else}}
 | 
			
		||||
						<dd>{{$.i18n.Tr "admin.config.routes_to_default_logger"}}</dd>
 | 
			
		||||
					{{end}}
 | 
			
		||||
					<dt>{{$.i18n.Tr "admin.config.xorm_log_sql"}}</dt>
 | 
			
		||||
					<dd><i class="fa fa{{if $.LogSQL}}-check{{end}}-square-o"></i></dd>
 | 
			
		||||
				{{else}}
 | 
			
		||||
					<dd>{{$.i18n.Tr "admin.config.disabled_logger"}}</dd>
 | 
			
		||||
				{{end}}
 | 
			
		||||
			</dl>
 | 
			
		||||
		</div>
 | 
			
		||||
	</div>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user