Ticket #557: cherrpy_socket_file.diff

_cpserver.py

old	new
92	92	if not self.httpserver:
93	93	return
94	94
95		if cherrypy.config.get('server.socket_port'):
	95	if cherrypy.config.get('server.socket_file'):
	96	on_what = "socket file: %s" % cherrypy.config.get('server.socket_file')
	97	else:
96	98	host = cherrypy.config.get('server.socket_host')
97	99	port = cherrypy.config.get('server.socket_port')
98	100
…	…
101	103	if not host:
102	104	host = 'localhost'
103	105	on_what = "http://%s:%s/" % (host, port)
104		~~else:~~
105		~~on_what = "socket file: %s" % cherrypy.config.get('server.socket_file')~~
106	106
107	107	# HTTP servers MUST be started in a new thread, so that the
108	108	# main thread persists to receive KeyboardInterrupt's. If an