Attachment #3608 for bug #22898




		'logfile':		'/var/log/univention/updater.log',
		'statusfile':	'/var/lib/univention-updater/univention-updater.status'
	},
	# *** IMPORTANT! *** the arg list from our request contains the COMPONENT name but the command
	#					here must contain the list of DEFAULTPACKAGES!
	# cmd = '/usr/share/univention-updater/univention-updater-umc-univention-install %s' % (' '.join(pkglist))
	'component': {
		'purpose':		_("Install component '%s'"),

				MODULE.info("   << %s" % s)
		# -----------------------------------
		result = None
		job = ''
		if self._current_job and 'job' in self._current_job:
			job = self._current_job['job']
		else:
			job = request.options.get('job','')

		count = request.options.get('count',0)
		result = 0 if count < 0 else []
		if not job in INSTALLERS:
			# job empty: this is the first call I can't avoid
			if job != '':
				MODULE.warn("   ?? Don't know a '%s' job" % job)
		else:
			if not 'logfile' in INSTALLERS[job]:
				MODULE.warn("   ?? Job '%s' has no associated log file" % job)

		job = request.options.get('job','')
		result = {}
		if job in INSTALLERS:
			# make a copy, not a reference!
			result = {}
			for arg in INSTALLERS[job]:
				result[arg] = INSTALLERS[job][arg]
				
			if 'statusfile' in INSTALLERS[job]:
				try:
					for line in open(INSTALLERS[job]['statusfile']):

					result['label'] = result['purpose'] % result['detail']
				else:
					result['label'] = result['purpose']
			# Affordance to reboot... hopefully this gets set before
			# we stop polling on this job status
			self.ucr.load()		# make it as current as possible
			result['reboot'] = self.ucr.is_true('update/reboot/required',False)

		# ----------- DEBUG -----------------
		MODULE.info("online/installer/status returns:")

			at the top of the file.
		"""
		# ----------- DEBUG -----------------
		MODULE.warn("online/installer/execute invoked with:")
		pp = pprint.PrettyPrinter(indent=4)
		st = pp.pformat(request.options).split("\n")
		for s in st:
				MODULE.warn("   << %s" % s)
		# -----------------------------------
		
		# Clean up any stored job details ... they're now obsolete.
		self._current_job = {}
		
		result = {}
		result['status'] = 0		# successful. If not: set result['message'] too.
		

			self.finished(request.id,result)
			return
		
		try:
			# Assemble the command line, now somewhat complicated:
			#
			#	(1)	take the 'command' entry from the INSTALLERS entry of this subject
			#	(2)	if it doesn't contain a percent sign -> ready.
			#	(3)	if it contains a percent sign: we must format something:
			#	(4)	if the subject is about 'component' we must get the 'defaultpackages'
			#		entry from the UCR tuple named by 'detail' and use that.
			#	(5)	if not, we can format the 'detail' field into the command.
			cmd = '%s' % INSTALLERS[subject]['command']		# I need a copy of this string!
			if cmd.find('%') != -1:
				if subject == 'component':
					# Strictly spoken, we can't arrive here if 'defaultpackages' is not set
					ucrs = '%s/%s/defaultpackages' % (COMPONENT_BASE,detail)
					pkgs = self.ucr.get(ucrs,'')
					cmd = cmd % pkgs
					MODULE.warn("  Resolution of default packages of the '%s' component:" % detail)
					MODULE.warn("     UCRS = '%s'" % ucrs)
					MODULE.warn("     PKGS = '%s'" % pkgs)
					MODULE.warn("     CMD  = '%s'" % cmd)
				else:
					cmd = cmd % request.options.get('detail','')
			MODULE.warn("   ++ Creating job: '%s'" % cmd)
			self.__create_at_job(cmd,detail)
		except Exception,ex:
			MODULE.warn("   ERROR: %s" % str(ex))
		
		# ----------- DEBUG -----------------
		MODULE.info("online/installer/execute returns:")

		script = '''
#:started: %s
#:detail: %s
#:command: %s
dpkg-statoverride --add root root 0644 /usr/sbin/univention-management-console-web-server
dpkg-statoverride --add root root 0644 /usr/sbin/univention-management-console-server
dpkg-statoverride --add root root 0644 /usr/sbin/apache2

dpkg-statoverride --remove /usr/sbin/univention-management-console-server
dpkg-statoverride --remove /usr/sbin/apache2
chmod +x /usr/sbin/univention-management-console-server /usr/sbin/univention-management-console-web-server /usr/sbin/apache2
''' % (started,detail,command,command)
		p1 = subprocess.Popen( [ 'LC_ALL=C at now', ], stdin = subprocess.PIPE, stdout = subprocess.PIPE, stderr = subprocess.PIPE, shell = True )
		(stdout,stderr) = p1.communicate( script )
		




		
		// waits for the Progress Page to be closed (automatically or by a close button)
		dojo.connect(this._progress,'stopWatching',dojo.hitch(this, function(tab) {
			this._updates.refreshPage(true);
			this.hideChild(this._progress);
			this.showChild(this._updates);
			this.showChild(this._components);

			this.selectChild(tab);
		}));
		
		// waits for the Progress Page to notify us that a job is finished. This
		// should immediately refresh the 'Updates' and 'Components' pages.
		dojo.connect(this._progress,'jobFinished',dojo.hitch(this, function() {
			this._updates.refreshPage(true);
			this._components.refreshPage();
		}));
		
		// waits for the Progress Page to notify us that a job is running
		dojo.connect(this._progress,'jobStarted',dojo.hitch(this, function() {
			this._switch_to_progress_page();

					{
						txt += "<tr>\n";
						txt += "<td style='padding-left:1em;'>" + upd[i][0] + "</td>\n";
						txt += "<td style='padding-left:1em;padding-right:.5em;'>" + upd[i][1] + "</td>\n";
						txt += "</tr>\n";
					}
				}

					{
						txt += "<tr>\n";
						txt += "<td style='padding-left:1em;'>" + ins[i][0] + "</td>\n";
						txt += "<td style='padding-left:1em;padding-right:.5em;'>" + ins[i][1] + "</td>\n";
						txt += "</tr>\n";
					}
				}

(-)umc/js/_online/ProgressPage.js (-4 / +26 lines)

Lines 152-157	Link Here

152

153

				msg += this._statusfile_data(data.result);

153

				msg += this._statusfile_data(data.result);

154

155

				// -------------- DEBUG ------------------

156

//				for (var v in this._last_job)

157

//				{

158

//					msg += ("<br/>&nbsp;&nbsp;&nbsp;" + v + "&nbsp;=&nbsp;'" + this._last_job[v] + "'");

159

//				}

160

				// ---------------------------------------

161

155

				this._head.set('content',msg);

162

				this._head.set('content',msg);

156

				this._pane.layout();

163

				this._pane.layout();

157

164

Lines 178-184	Link Here

178

185

179

	// takes a status structure as returned from the 'online/installer/status' call,

186

	// takes a status structure as returned from the 'online/installer/status' call,

180

	// extracts the fields that came directly from the status file (if any) and

187

	// extracts the fields that came directly from the status file (if any) and

181

	// formats them in a readable HTML fashion.

188

	// formats them into a one-liner. Returns an empty string if nothing matches.

182

	_statusfile_data: function(data) {

189

	_statusfile_data: function(data) {

183

190

184

		var txt = '';

191

		var txt = '';

Lines 243-248	Link Here

243

250

244

			if ((this._job_key != '') && (this._last_job))

251

			if ((this._job_key != '') && (this._last_job))

245

252

253

				// First thing to do: notify the Module that the job is finished. So it can already

254

				// refresh the 'Updates' and 'Components' pages before the user gets back there.

255

				this.jobFinished();

256

246

				// FIXME Manually making empty lines before and after this text; should better be done

257

				// FIXME Manually making empty lines before and after this text; should better be done

247

				//		by a style or a style class.

258

				//		by a style or a style class.

248

				var msg = "&nbsp;<br/>";

259

				var msg = "&nbsp;<br/>";

Lines 256-266	Link Here

256

267

257

				msg += this._statusfile_data(this._last_job);

268

				msg += this._statusfile_data(this._last_job);

258

269

270

				// -------------- DEBUG ------------------

271

//				for (var v in this._last_job)

272

//				{

273

//					msg += ("<br/>&nbsp;&nbsp;&nbsp;" + v + "&nbsp;=&nbsp;'" + this._last_job[v] + "'");

274

//				}

275

				// ---------------------------------------

276

259

				this._head.set('content',msg);

277

				this._head.set('content',msg);

260

278

261

				// for the last time: scroll log view to bottom and stop polling timer.

279

				this._log.stopWatching();		// now log is freely scrollable manually

262

				this._log.scrollToBottom();

263

				this._log.stopWatching();

264

280

265

				//alert("Watching is finished, job is '" + this._job_key + "'");

281

				//alert("Watching is finished, job is '" + this._job_key + "'");

266

282

Lines 281-286	Link Here

281

	jobStarted: function() {

297

	jobStarted: function() {

282

},

298

},

283

299

300

	// This function will be called when the already opened ProgressPage encounters

301

	// the end of the current job. The online Module listens here and will refresh

302

	// the 'Updates' and 'Components' pages.

303

	jobFinished: function() {

304

},

305

284

	// online Module calls this when the ProgressPage is to be opened.

306

	// online Module calls this when the ProgressPage is to be opened.

285

	startWatching: function(args) {

307

	startWatching: function(args) {

286

		//alert("ProgressPage::startWatching()");

308

		//alert("ProgressPage::startWatching()");

(-)umc/js/_online/UpdatesPage.js (+8 lines)

Lines 10-15	Link Here

dojo.declare("umc.modules._online.UpdatesPage", umc.modules._online.Page, {

dojo.declare("umc.modules._online.UpdatesPage", umc.modules._online.Page, {

	i18nClass: 		'umc.modules.online',

	i18nClass: 		'umc.modules.online',

	_last_reboot:	false,

    postMixInProperties: function() {

    postMixInProperties: function() {

Lines 507-512	Link Here

507

			on = (on == 'true');

508

			on = (on == 'true');

508

509

510

511

		// pop a message up whenever the 'on' value changes

512

		if (on != this._last_reboot)

513

514

			alert("Reboot affordance changed to " + on);

515

			this._last_reboot = on;

516

517

510

		var pane = this._form.getChildren()[0].getChildren()[0];

518

		var pane = this._form.getChildren()[0].getChildren()[0];

511

		dojo.toggleClass(pane.domNode,'dijitHidden',! on);

519

		dojo.toggleClass(pane.domNode,'dijitHidden',! on);

512

520

(-)umc/js/_online/_LogViewer.js (-2 / +1 lines)

Lines 186-193	Link Here

186

	// job key can't be an argument here as we don't know it.

186

	// job key can't be an argument here as we don't know it.

187

	startWatching: function(interval) {

187

	startWatching: function(interval) {

188

189

		//alert("LogViewer::StartWatching(" + interval + ")");

190

191

		this._check_interval = interval;

189

		this._check_interval = interval;

192

		// clean up any stale display and states from last run

190

		// clean up any stale display and states from last run

193

		this.set('content',this._("... loading log file ..."));

191

		this.set('content',this._("... loading log file ..."));

Lines 208-213	Link Here

208

	// effectively stops the polling timer. Can be called from outside (if ProgressPage is being closed)

206

	// effectively stops the polling timer. Can be called from outside (if ProgressPage is being closed)

209

	// or from inside (as 'uninitialize' handler)

207

	// or from inside (as 'uninitialize' handler)

210

	stopWatching: function() {

208

	stopWatching: function() {

209

211

		this._check_interval = 0;

210

		this._check_interval = 0;

212

},

211

},

213

212

Return to bug 22898