Attachment #3609 for bug #22898




from string import join
from subprocess import Popen
from hashlib import md5
from copy import deepcopy

from univention.management.console.log import MODULE
from univention.management.console.protocol.definitions import *

		'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)
			else:
				fname = INSTALLERS[job]['logfile']
				if count < 0:
					result = self._logstamp(fname)
				else:
					# don't read complete file if we have an 'ignore' count
					if (count == 0) and (self._current_job['lines']):
						count = -self._current_job['lines']
					result = self._logview(fname, count)
				
		# again debug, shortened
		if isinstance(result,int):

		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]
			result = deepcopy(INSTALLERS[job])
				
			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:")

				MODULE.info("   << %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
		
		# We want to limit the amount of logfile data being transferred
		# to the frontend. So we remember the line count of the associated
		# log file.
		if 'logfile' in INSTALLERS[subject]:
			fname = INSTALLERS[subject]['logfile']
			count = 0
			try:
				file = open(fname,'r')
				count = 0
				for line in file:
					count += 1
			finally:
				if file != None:
					file.close()
			self._current_job['lines'] = count
		
		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!
			cmd = INSTALLERS[subject]['command']
			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.info("  Resolution of default packages of the '%s' component:" % detail)
					MODULE.info("     UCRS = '%s'" % ucrs)
					MODULE.info("     PKGS = '%s'" % pkgs)
					MODULE.info("     CMD  = '%s'" % cmd)
				else:
					cmd = cmd % request.options.get('detail','')
			MODULE.info("   ++ 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:")
		pp = pprint.PrettyPrinter(indent=4)

#
# ------------------------------------------------------------------------------

	def _logstamp(self,fname):
		""" Logfile timestamp. Now a seperate function.
		"""
		try:
			st = stat(fname)
			if st:
				MODULE.info("   >> log file stamp = '%s'" % st[9])
				return st[9]
			return 0
		except:
			return 0
		
	def _logview(self,fname,count):
		""" Contains all functions needed to view or 'tail' an arbitrary text file.
			Argument 'count' can have different values:
			< 0 ... ignore this many lines, return the rest of the file
			0 ..... return the whole file, splitted into lines.
			> 0 ... return the last 'count' lines of the file. (a.k.a. tail -n <count>)
		"""
		lines = []
		if count < 0:
			try:
				st = stat(fname)
				if st:
					MODULE.info("   >> log file stamp = '%s'" % st[9])
					return st[9]
				return 0
			except:
				return 0
		try:
			file = open(fname,'r')
			for line in file:
				if (count < 0):
					count += 1
				else:
					l = line.rstrip()
					lines.append(l)
					if (count > 0) and (len(lines) > count):
						lines.pop(0)
		finally:
			if file != None:
				file.close()

		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 )
		

						cmd = INSTALLERS[inst]['command'].split('%')[0]
						MODULE.info("   ++ Checking for '%s'" % cmd)
						if cmd in atout:
# cleaning up is done in 'run_installer()'
#							self._current_job = {}
							self._current_job['job'] = inst				# job key
							self._current_job['running'] = True			# currently running: we have found it per 'at' job
							self._current_job['time'] = int(time())		# record the last time we've seen this job




		
		// 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.showChild(this._settings);
			
			// Revert to the 'Updates' page if the installer action encountered
			// the 'reboot' affordance.
			if (! tab)
			{
				tab = this._updates;
			}
			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();

		
		this.hideChild(this._details);
		this.hideChild(this._progress);
		
	},
	
	// Seperate function that can be called the same way as _call_installer:

					{
						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 (-8 / +71 lines)

Lines 75-80	Link Here

    		region:		'bottom',

    		region:		'bottom',

    		onClick:	dojo.hitch(this, function() {

    		onClick:	dojo.hitch(this, function() {

    			var tab = '';

    			var tab = '';

    			// Especially for the 'install a component' functionality: if we encounter

    			// that the 'reboot required' flag has been set we don't want to switch

    			// back to the 'Components' grid but rather to the 'Updates' page. We will

    			// request this by unsetting the _last_tab property, so the switching

    			// logic will revert to the first tab of our tab set.

    			if (this._reboot_required)

    				//alert("Resetting return tab to 'Updates'");

    				this.last_tab = null;

    			if (this.last_tab)

    			if (this.last_tab)

    				tab = this.last_tab;

    				tab = this.last_tab;

Lines 152-164	Link Here

152

162

153

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

163

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

154

164

165

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

166

//				for (var v in this._last_job)

167

//				{

168

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

169

//				}

170

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

171

155

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

172

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

156

				this._pane.layout();

157

173

158

				if (! data.result['running'])

174

				if (! data.result['running'])

159

175

160

					this._allow_close(true);		// does the rest.

176

					this._allow_close(true);		// does the rest.

161

177

178

179

				this._pane.layout();

162

180

163

181

164

182

Lines 178-184	Link Here

178

196

179

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

197

	// 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

198

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

181

	// formats them in a readable HTML fashion.

199

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

200

//

201

	// FOR TEST: now includes the 'reboot' flag if it is present.

182

	_statusfile_data: function(data) {

202

	_statusfile_data: function(data) {

183

203

184

		var txt = '';

204

		var txt = '';

Lines 193-198	Link Here

193

213

194

214

195

215

216

		if (data['reboot'])

217

218

			txt += ' [REBOOT] ';

219

			if (! this._reboot_required)		// not set or not true

220

221

				//alert("Setting REBOOT from _statusfile_data");

222

				this._reboot_required = true;

223

224

225

196

		if (txt != '')

226

		if (txt != '')

197

227

198

			txt = "(" + this._("Current status file content") + ":" + txt + ")<br/>";

228

			txt = "(" + this._("Current status file content") + ":" + txt + ")<br/>";

Lines 243-248	Link Here

243

273

244

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

274

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

245

275

276

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

277

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

278

				this.jobFinished();

279

246

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

280

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

247

				//		by a style or a style class.

281

				//		by a style or a style class.

248

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

282

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

Lines 256-273	Link Here

256

290

257

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

291

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

258

292

293

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

294

//				for (var v in this._last_job)

295

//				{

296

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

297

//				}

298

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

299

259

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

300

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

260

301

261

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

302

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

262

				this._log.scrollToBottom();

263

				this._log.stopWatching();

264

303

265

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

304

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

266

305

306

				if ((this._last_job) && (this._last_job['reboot']))

307

308

					var reb = this._last_job['reboot'];

309

					if (typeof(reb) == 'string')

310

311

						reb = (reb == 'true');

312

313

					if ((! this._reboot_required) || (reb != this._reboot_required))

314

315

						//alert("setting REBOOT from _allow_close()");

316

						this._reboot_required = reb;

317

318

319

267

				this._last_job = null;	// can be deleted, but this._job_key should be retained!

320

				this._last_job = null;	// can be deleted, but this._job_key should be retained!

268

321

269

322

270

		this._pane.layout();

271

},

323

},

272

324

273

	// gives a means to restart polling after reauthentication

325

	// gives a means to restart polling after reauthentication

Lines 281-289	Link Here

281

	jobStarted: function() {

333

	jobStarted: function() {

282

},

334

},

283

335

336

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

337

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

338

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

339

	jobFinished: function() {

340

},

341

284

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

342

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

285

	startWatching: function(args) {

343

	startWatching: function(args) {

286

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

344

345

		// ensure a clean look (and not some stale text from last job)

346

		this._head.set('content',this._("... loading job data ..."));

347

287

		dojo.mixin(this,args);						// as simple as possible.

348

		dojo.mixin(this,args);						// as simple as possible.

288

		this._allow_close(false);					// forbid closing this tab.

349

		this._allow_close(false);					// forbid closing this tab.

289

		this._log.startWatching(this._interval);	// start logfile tail

350

		this._log.startWatching(this._interval);	// start logfile tail

Lines 291-300	Link Here

291

352

292

	// online Module listens to this event to close the page

353

	// online Module listens to this event to close the page

293

	// and reopen the named tab.

354

	// and reopen the named tab.

355

//

356

	// This is a good place to reset the log viewer contents too.

294

	stopWatching: function(tab) {

357

	stopWatching: function(tab) {

295

		this._job_key = '';

358

		this._job_key = '';

296

		this._last_job = null;

359

		this._last_job = null;

297

		this._log.stopWatching();

360

		this._log.stopWatching(true);

298

},

361

},

299

362

300

	// lets the timer loop stop when the module is closed.

363

	// lets the timer loop stop when the module is closed.

(-)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 (-3 / +10 lines)

Lines 186-196	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 ..."));

192

194

		this._first_call = 3;

193

		this._first_call = 3;

195

		this._last_stamp = 0;

194

		this._last_stamp = 0;

196

195

Lines 207-214	Link Here

207

206

208

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

207

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

209

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

208

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

210

	stopWatching: function() {

209

//

210

	// Argument 'clean' = TRUE -> also clean up display buffer contents.

211

	stopWatching: function(clean) {

212

211

		this._check_interval = 0;

213

		this._check_interval = 0;

214

215

		if ((typeof(clean) != 'undefined') && (clean))

216

217

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

218

212

},

219

},

213

220

214

	uninitialize: function() {

221

	uninitialize: function() {

Return to bug 22898