View | Details | Raw Unified | Return to bug 36106 | Differences between
and this patch

Collapse All | Expand All

(-)a/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-daemon/debian/changelog (+6 lines)
 Lines 1-3    Link Here 
1
univention-virtual-machine-manager-daemon (4.0.21-1) unstable; urgency=low
2
3
  * Bug #36106: Fix noVNC temporary file location
4
5
 -- Philipp Hahn <hahn@univention.de>  Tue, 18 Nov 2014 20:00:58 +0100
6
1
univention-virtual-machine-manager-daemon (4.0.20-1) unstable; urgency=medium
7
univention-virtual-machine-manager-daemon (4.0.20-1) unstable; urgency=medium
2
8
3
  * Bug #36615: fix javascript memory leaks
9
  * Bug #36615: fix javascript memory leaks
(-)a/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-daemon/src/univention/uvmm/node.py (-3 / +3 lines)
 Lines 737-745   class Node(PersistentCached): Link Here 
737
			self.write_novnc_tokens()
737
			self.write_novnc_tokens()
738
738
739
	def write_novnc_tokens(self):
739
	def write_novnc_tokens(self):
740
		path = os.path.join(self.cache_dir, 'novnc.tokens', uri_encode(self.pd.uri))
740
		token_dir = os.path.join(self.cache_dir, 'novnc.tokens')
741
		path = os.path.join(token_dir, uri_encode(self.pd.uri))
741
		logger.debug("Writing noVNC tokens to '%s'", path)
742
		logger.debug("Writing noVNC tokens to '%s'", path)
742
		with tempfile.NamedTemporaryFile(delete=False) as tmp_file:
743
		with tempfile.NamedTemporaryFile(delete=False, dir=token_dir) as tmp_file:
743
			for uuid, domStat in self.domains.iteritems():
744
			for uuid, domStat in self.domains.iteritems():
744
				try:
745
				try:
745
					gfx = domStat.pd.graphics[0]
746
					gfx = domStat.pd.graphics[0]
746
- 

Return to bug 36106