Attachment 2300 Details for Bug 17666

[patch] Proof-Of-Concept für ajax-basiertes tail

updater-tailwindow.patch (text/plain), 4.01 KB, created by Sönke Schwardt-Krummrich on 2010-02-16 14:21 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Sönke Schwardt-Krummrich

Created: 2010-02-16 14:21 CET

Size: 4.01 KB

patch

obsolete

>--- univention-updater/modules/univention/management/console/handlers/update/__init__.py
>+++ univention-updater/modules/univention/management/console/handlers/update/__init__.py
>@@ -41,6 +41,7 @@ import univention.debug as ud
> import univention.config_registry
> 
> from univention.updater import UniventionUpdater
>+from json import JsonReader, JsonWriter
> 
> import os
> import subprocess, string, time
>@@ -125,7 +126,13 @@ command_description = {
> 		values = {
> 		},
> 	),
>-
>+	'update/tail_file': umch.command(
>+		short_description = _('Get tail of logfile' ),
>+		method = 'tail_file',
>+		values = {
>+			'filename': umc.String( _( 'Name of the log file' ), required = False ),
>+		},
>+	),
> }
> 
> 
>@@ -146,6 +153,7 @@ class handler(umch.simpleHandler):
> 
> 		self.ucr_reinit = False
> 
>+		self.tail_fn2fd = {}
> 
> 	def overview(self, object):
> 		_d = ud.function('update.handler.overview')
>@@ -389,6 +397,49 @@ class handler(umch.simpleHandler):
> 		self.finished(object.id(), stdout)
> 
> 
>+	def tail_file(self, object):
>+		_d = ud.function('update.handler.tail_file')
>+
>+		logfn = object.options.get('filename')
>+		if not logfn in ('/var/log/univention/updater.log'):
>+			self.finished(object.id(), '%s: access not allowed by UMC module' % logfn)
>+			return
>+
>+		# create fd if fd is not present
>+		if not logfn in self.tail_fn2fd:
>+			fd = open(logfn,'r+')
>+			self.tail_fn2fd[logfn] = fd
>+		else:
>+			fd = self.tail_fn2fd[logfn]
>+
>+		curpos = fd.tell()
>+		fd.seek(0,2)       # seek to file end
>+		endpos = fd.tell()
>+		fd.seek(curpos,0)  # seek back to cur pos
>+		pendingbytes = endpos - curpos
>+		data = fd.read(pendingbytes)  # get pending data
>+		ud.debug(ud.ADMIN, ud.PROCESS, 'update.handler.tail_file: %d %d %d %d' % (curpos, endpos, pendingbytes, len(data)))
>+
>+		self.finished(object.id(), {'data': data, 'test': 'das ist ein test'})
>+
>+	def _web_tail_file(self, object, res):
>+		_d = ud.function('update.handler._web_tail_file')
>+		content_type = 'application/json'
>+		content = ''
>+
>+		data = {}
>+		data['identifier'] = 'data'
>+		data['label'] = 'updater data'
>+		data['items'] = [ res.dialog ]
>+		try:
>+			json = JsonWriter()
>+			content = json.write(data)
>+		except:
>+			ud.debug(ud.ADMIN, ud.PROCESS, 'update.handler._web_tail_file: failed to create JSON: %s' % (traceback.format_exc().replace('%','#')) )
>+		res.dialog = { 'Content-Type': content_type, 'Content': content }
>+		self.revamped( object.id(), res, rawresult = True )
>+
>+
> 	#######################
> 	# The revamp functions
> 	#######################
>@@ -506,7 +557,39 @@ class handler(umch.simpleHandler):
> 		frame_release = umcd.Frame([list_release], _('Release information'))
> 		frame_component = umcd.Frame([list_component], _('Components'))
> 
>-		res.dialog = [frame_release, frame_component]
>+		javascript = umcd.HTML ("""<script type='text/javascript'>
>+var umc = {};
>+umc.updater = {};
>+umc.updater.updateData = function(sessionid) {
>+	var foocallback = function (item, request) {
>+	    dojo.byId ('taildata').innerHTML = dojo.byId ('taildata').innerHTML + item.data;
>+		dojo.byId('tailwnd').scrollTop = dojo.byId('tailwnd').scrollHeight;
>+		return false;
>+	};
>+
>+	if (umc.updater.store) {
>+		umc.updater.store.close ()
>+	}
>+	umc.updater.store = new dojo.data.ItemFileReadStore ({url:'ajax.py?session_id='+sessionid+'&umcpcmd=update/tail_file&filename=/var/log/univention/updater.log&date=' + new Date ().getTime ()});
>+	umc.updater.store.fetch (
>+		{
>+			query: {data: '*'},
>+			onItem: foocallback,
>+		}
>+	);
>+};
>+dojo.addOnLoad (function () {
>+    window.setInterval( function () {umc.updater.updateData ('%s');}, 2000);
>+});
>+dojo.require ('dojo.data.ItemFileReadStore');
>+				</script>""" % (self._sessionid))
>+		divitems = umcd.HTML('<div id="tailwnd" style="width:800px; height:200px; overflow: scroll; border:1px solid #000000; margin: 1px"><pre id="taildata">TEST</pre></div>')
>+
>+		list_test = umcd.List()
>+		list_test.add_row([divitems, javascript])
>+		frame_test = umcd.Frame([list_test], _('LOG TEST'))
>+
>+		res.dialog = [frame_test, frame_release, frame_component]
> 		if frame_info:
> 			res.dialog.insert( 0, frame_info )
>

Actions: View | Diff

Attachments on bug 17666: 2300