Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 357

Timestamp:

06/22/05 00:32:21

Author:

fumanchu

Message:

Implements ticket #185 (easier log function = cpg.log).

Files:

trunk/cherrypy/_cpconfig.py (modified) (2 diffs)
trunk/cherrypy/_cphttpserver.py (modified) (5 diffs)
trunk/cherrypy/_cphttptools.py (modified) (1 diff)
trunk/cherrypy/_cpserver.py (modified) (4 diffs)
trunk/cherrypy/_cpwsgi.py (modified) (2 diffs)
trunk/cherrypy/cpg.py (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/cherrypy/_cpconfig.py

r315	r357
150	150	def _load(configFile = None):
151	151	""" Convert an INI file to a dictionary """
152		_cpLogMessage = _cputil.getSpecialAttribute('_cpLogMessage')
153
	152
154	153	# Parse config file
155	154	configParser = CaseSensitiveConfigParser()
156	155	if hasattr(configFile, 'read'):
157		~~_cpLogMessage~~("Reading infos from configFile stream", 'CONFIG')
	156	cpg.log("Reading infos from configFile stream", 'CONFIG')
158	157	configParser.readfp(configFile)
159	158	else:
160		~~_cpLogMessage~~("Reading infos from configFile: %s" % configFile, 'CONFIG')
	159	cpg.log("Reading infos from configFile: %s" % configFile, 'CONFIG')
161	160	configParser.read(configFile)
162	161
…	…
176	175
177	176	def outputConfigMap():
178		_cpLogMessage = _cputil.getSpecialAttribute('_cpLogMessage')
179		_cpLogMessage("Server parameters:", 'CONFIG')
180		_cpLogMessage(" server.environment: %s" % get('server.environment'), 'CONFIG')
181		_cpLogMessage(" server.logToScreen: %s" % get('server.logToScreen'), 'CONFIG')
182		_cpLogMessage(" server.logFile: %s" % get('server.logFile'), 'CONFIG')
183		_cpLogMessage(" server.protocolVersion: %s" % get('server.protocolVersion'), 'CONFIG')
184		_cpLogMessage(" server.socketHost: %s" % get('server.socketHost'), 'CONFIG')
185		_cpLogMessage(" server.socketPort: %s" % get('server.socketPort'), 'CONFIG')
186		_cpLogMessage(" server.socketFile: %s" % get('server.socketFile'), 'CONFIG')
187		_cpLogMessage(" server.reverseDNS: %s" % get('server.reverseDNS'), 'CONFIG')
188		_cpLogMessage(" server.socketQueueSize: %s" % get('server.socketQueueSize'), 'CONFIG')
189		_cpLogMessage(" server.threadPool: %s" % get('server.threadPool'), 'CONFIG')
190		_cpLogMessage(" session.storageType: %s" % get('session.storageType'), 'CONFIG')
	177	cpg.log("Server parameters:", 'CONFIG')
	178	cpg.log(" server.environment: %s" % get('server.environment'), 'CONFIG')
	179	cpg.log(" server.logToScreen: %s" % get('server.logToScreen'), 'CONFIG')
	180	cpg.log(" server.logFile: %s" % get('server.logFile'), 'CONFIG')
	181	cpg.log(" server.protocolVersion: %s" % get('server.protocolVersion'), 'CONFIG')
	182	cpg.log(" server.socketHost: %s" % get('server.socketHost'), 'CONFIG')
	183	cpg.log(" server.socketPort: %s" % get('server.socketPort'), 'CONFIG')
	184	cpg.log(" server.socketFile: %s" % get('server.socketFile'), 'CONFIG')
	185	cpg.log(" server.reverseDNS: %s" % get('server.reverseDNS'), 'CONFIG')
	186	cpg.log(" server.socketQueueSize: %s" % get('server.socketQueueSize'), 'CONFIG')
	187	cpg.log(" server.threadPool: %s" % get('server.threadPool'), 'CONFIG')
	188	cpg.log(" session.storageType: %s" % get('session.storageType'), 'CONFIG')
191	189	if get('session.storageType'):
192		~~_cpLogMessage~~(" session.timeout: %s min" % get('session.timeout'), 'CONFIG')
193		~~_cpLogMessage~~(" session.cleanUpDelay: %s min" % get('session.cleanUpDelay'), 'CONFIG')
194		~~_cpLogMessage~~(" session.cookieName: %s" % get('session.cookieName'), 'CONFIG')
195		~~_cpLogMessage~~(" session.storageFileDir: %s" % get('session.storageFileDir'), 'CONFIG')
196		~~_cpLogMessage~~(" staticContent: %s" % get('staticContent'), 'CONFIG')
	190	cpg.log(" session.timeout: %s min" % get('session.timeout'), 'CONFIG')
	191	cpg.log(" session.cleanUpDelay: %s min" % get('session.cleanUpDelay'), 'CONFIG')
	192	cpg.log(" session.cookieName: %s" % get('session.cookieName'), 'CONFIG')
	193	cpg.log(" session.storageFileDir: %s" % get('session.storageFileDir'), 'CONFIG')
	194	cpg.log(" staticContent: %s" % get('staticContent'), 'CONFIG')

trunk/cherrypy/_cphttpserver.py

r339	r357
28	28
29	29	import threading, SocketServer, BaseHTTPServer, socket, Queue
30		import cpg, _cpserver, _cp~~util, _cp~~httptools
	30	import cpg, _cpserver, _cphttptools
31	31
32	32	try:
…	…
107	107	def log_message(self, format, *args):
108	108	""" We have to override this to use our own logging mechanism """
109		~~_cputil.getSpecialAttribute('_cpLogMessage')~~(format % args, "HTTP")
	109	cpg.log(format % args, "HTTP")
110	110
111	111
…	…
141	141	return 1
142	142	except (KeyboardInterrupt, SystemExit):
143		~~_cputil.getSpecialAttribute('_cpLogMessage')~~("<Ctrl-C> hit: shutting down http server", "HTTP")
	143	cpg.log("<Ctrl-C> hit: shutting down http server", "HTTP")
144	144	self.shutdown()
145	145
…	…
195	195	"""Handle an error gracefully. May be overridden."""
196	196	errorBody = _cphttptools.formatExc()
197		~~_cputil.getSpecialAttribute('_cpLogMessage')~~(errorBody)
	197	cpg.log(errorBody)
198	198
199	199
…	…
273	273	request, client_address = self.get_request()
274	274	except (KeyboardInterrupt, SystemExit):
275		~~_cputil.getSpecialAttribute('_cpLogMessage')~~("<Ctrl-C> hit: shutting down", "HTTP")
	275	cpg.log("<Ctrl-C> hit: shutting down", "HTTP")
276	276	return 0
277	277	except socket.error, e:

trunk/cherrypy/_cphttptools.py

r356	r357
211	211
212	212	msg = "%s - %s" % (cpg.request.remoteAddr, self.requestLine[:-2])
213		~~_cputil.getSpecialAttribute('_cpLogMessage')~~(msg, "HTTP")
	213	cpg.log(msg, "HTTP")
214	214
215	215	cpg.request.base = "http://" + cpg.request.headerMap.get('Host', '')

trunk/cherrypy/_cpserver.py

r277	r357
35	35	import time
36	36	import sys
37		import cpg, _cp~~util, _cp~~httptools
	37	import cpg, _cphttptools
38	38
39	39	try:
…	…
128	128	cpg._httpserver = serverClass()
129	129
130		~~_cpLogMessage = _cputil.getSpecialAttribute('_cpLogMessage')~~
131
132		~~servingWhat = "HTTP"~~
133	130	if cpg.config.get('server', 'socketPort'):
134	131	onWhat = "socket: ('%s', %s)" % (cpg.config.get('server.socketHost'),
…	…
136	133	else:
137	134	onWhat = "socket file: %s" % cpg.config.get('server.socketFile')
138		~~_cpLogMessage("Serving %s on %s" % (servingWhat, onWhat)~~, 'HTTP')
	135	cpg.log("Serving HTTP on %s" % onWhat, 'HTTP')
139	136
140	137	# Start the http server.
…	…
142	139	cpg._httpserver.start()
143	140	except (KeyboardInterrupt, SystemExit):
144		~~_cpLogMessage~~("<Ctrl-C> hit: shutting down", "HTTP")
	141	cpg.log("<Ctrl-C> hit: shutting down", "HTTP")
145	142	stop()
146	143

trunk/cherrypy/_cpwsgi.py

r339	r357
34	34	import os, socket, sys, traceback, urllib
35	35	import SocketServer, BaseHTTPServer
36		import cpg, _cpserver, _cp~~util, _cp~~httptools, _cpwsgiserver
	36	import cpg, _cpserver, _cphttptools, _cpwsgiserver
37	37
38	38
…	…
104	104	except:
105	105	tb = _cphttptools.formatExc()
106		~~_cputil.getSpecialAttribute('_cpLogMessage')~~(tb)
	106	cpg.log(tb)
107	107	s, h, b = _cphttptools.bareError(tb)
108	108	# CherryPy test suite expects bareError body to be output,

trunk/cherrypy/cpg.py

r315	r357
45	45	return func
46	46
	47	def log(msg, context='', severity=0):
	48	"""Syntactic sugar for writing to the log."""
	49	import _cputil
	50	logfunc = _cputil.getSpecialAttribute('_cpLogMessage')
	51	logfunc(msg, context, severity)
47	52
48
49

Changeset Navigation

Changeset 357

Legend:

trunk/cherrypy/_cpconfig.py

trunk/cherrypy/_cphttpserver.py

trunk/cherrypy/_cphttptools.py

trunk/cherrypy/_cpserver.py

trunk/cherrypy/_cpwsgi.py

trunk/cherrypy/cpg.py

Download in other formats: