Attachment #2920 for bug #18191

View | Details | Raw Unified | Return to bug 18191
Collapse All | Expand All

(-)debian/control (-2 lines)

Lines 49-55	Link Here

 Alive Events while the DVS Session is open. Via HTTPS

 Alive Events while the DVS Session is open. Via HTTPS

 it listens for commands issued by the Sessionbroker.

 it listens for commands issued by the Sessionbroker.

Package: univention-thin-client-dvs-client

Package: univention-thin-client-dvs-client

Architecture: all

Architecture: all

Depends: rdesktop,

Depends: rdesktop,

Lines 79-82	Link Here

Description: UCS DVS Webaccess

Description: UCS DVS Webaccess

 This package provides the Webaccess html for UCS DVS.

 This package provides the Webaccess html for UCS DVS.

 Primarily intended for installation on an xrdp server.

 Primarily intended for installation on an xrdp server.

(-)debian/changelog (+7 lines)

Lines 1-3	Link Here

univention-dvs-sessionbroker (0.4.3-2) unstable; urgency=low

  * Fix exception on broken pipe (Bug #19943)

  * Fix session not resuming.

 -- Philipp Hahn <hahn@univention.de>  Wed, 15 Dec 2010 11:28:41 +0100

univention-dvs-sessionbroker (0.4.3-1) unstable; urgency=low

univention-dvs-sessionbroker (0.4.3-1) unstable; urgency=low

  * remove workaround for Bug #20924

  * remove workaround for Bug #20924

(-)univention-dvs-sessionbroker-client (-1 / +10 lines)

Lines 283-289	Link Here

283

			# Reconnect after closing current (defunc) connection

283

			# Reconnect after closing current (defunc) connection

284

			try:

284

			try:

285

				conn2

285

				conn2

286

			except:

286

			except NameError:

287

				conn2 = httplib.HTTPSConnection(options.sessionbrokerhost, options.port)

287

				conn2 = httplib.HTTPSConnection(options.sessionbrokerhost, options.port)

288

				conn2.auto_open = False

288

				conn2.auto_open = False

289

				conn2.connect()

289

				conn2.connect()

Lines 295-301	Link Here

295

			log(2, 'alive event server response %d: %s\n' % (response.status, body))

295

			log(2, 'alive event server response %d: %s\n' % (response.status, body))

296

			if response.status == httplib.OK: # 200

296

			if response.status == httplib.OK: # 200

297

				continue

297

				continue

298

			elif response.status == httplib.REQUEST_TIMEOUT: # 408

299

				log(0, 'timeout sending alive event, retrying')

300

				continue

301

			elif response.status == httplib.BAD_REQUEST: # 400

302

				log(0, 'session invalidated by session broker, terminating')

303

				terminate()

298

			else:

304

			else:

305

				log(0, 'Unhandled error code %d, terminating' % response.status)

299

				terminate()

306

				terminate()

300

		except httplib.BadStatusLine:

307

		except httplib.BadStatusLine:

301

			log(0, 'connection closed while receiving alive event')

308

			log(0, 'connection closed while receiving alive event')

Lines 318-323	Link Here

318

		body = response.read()

325

		body = response.read()

319

	except httplib.CannotSendRequest:

326

	except httplib.CannotSendRequest:

320

		pass

327

		pass

328

	except socket.error, (err, errstr):

329

		pass

321

330

322

	conn2.close()

331

	conn2.close()

323

332

(-)univention-dvs-sessionbroker (-2 / +2 lines)

Lines 451-458	Link Here

451

				if status == SESSION_STATUS_SILENT:

451

				if status == SESSION_STATUS_SILENT:

452

					logger.info(_("Resuming session %s") % session_id)

452

					logger.info(_("Resuming session %s") % session_id)

453

				## periodic alive event

453

				## periodic alive event

454

				query = "UPDATE sessions SET expires=DATE_ADD(now(),INTERVAL %s SECOND) WHERE session_id=%s"

454

				query = "UPDATE sessions SET expires=DATE_ADD(now(),INTERVAL %s SECOND), status=%s WHERE session_id=%s"

455

				values = (2*update_interval, session_id)

455

				values = (2*update_interval, SESSION_STATUS_ACTIVE, session_id)

456

				rows = cursor.execute(query, values)

456

				rows = cursor.execute(query, values)

457

				if rows != 1:

457

				if rows != 1:

458

					logger.warning(query % values)

458

					logger.warning(query % values)

Return to bug 18191