Attachment #6574 for bug #37458

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




	:members:
	:undoc-members:
	:show-inheritance:

----------
Statistics
----------

.. automodule:: univention.management.console.statistics
	:members:
	:undoc-members:
	:show-inheritance:


(-)a/ucs-4.0-0/management/univention-management-console/src/univention/management/console/protocol/definitions.py (-4 lines)

Lines 70-79 COMMANDS = (	Link Here

	CommandDefinition('VERSION', False),

	CommandDefinition('VERSION', False),

	CommandDefinition('GET', True),

	CommandDefinition('GET', True),

	CommandDefinition('SET', True),

	CommandDefinition('SET', True),

	CommandDefinition('CLOSE', False),

	CommandDefinition('STATISTICS', False),

	CommandDefinition('CANCEL', False, 'ids'),

	CommandDefinition('STATUS', False, 'ids'),

	CommandDefinition('EXIT', True),

	CommandDefinition('EXIT', True),

	CommandDefinition('UPLOAD', True),

	CommandDefinition('UPLOAD', True),




import fcntl
import gzip
import os
import pwd
import re
import socket


from ..resources import moduleManager, categoryManager
from ..log import CORE, CRYPT, RESOURCES
from ..config import ucr, SERVER_MAX_CONNECTIONS
from ..statistics import statistics


class MagicBucket(object):

		state.signal_connect('authenticated', self._authenticated)
		self.__states[socket] = state
		notifier.socket_add(socket, self._receive)
		statistics.connections.new()

	def exit(self):
		'''Closes all open connections.'''

			if state.processor is not None:
				state.processor.shutdown()
			notifier.socket_remove(sock)
			statistics.connections.inactive()
		# delete states
		for state in self.__states.values():
			del state

		state.authResponse.status = result.status
		if result.message:
			state.authResponse.message = result.message
		if result:
			statistics.users.add(state.username)
		state.authenticated = bool(result)
		self._response(state.authResponse, state)
		state.authResponse = None

		All other valid commands are redirected to the processor.
		"""
		state.requests[msg.id] = msg
		statistics.requests.new()
		CORE.info('Incoming request of type %s' % msg.command)
		if not state.authenticated and msg.command != 'AUTH':
			res = Response(msg)

					pass

			self._response(response, state)
		elif msg.command == 'STATISTICS':
			response = Response(msg)
			try:
				pwent = pwd.getpwnam(state.username)
				if not pwent.pw_uid in (0, ):
					raise KeyError
				CORE.info('Sending statistic data to client')
				response.status = SUCCESS
				response.result = statistics.json()
			except KeyError:
				CORE.info('User not allowed to retrieve statistics')
				response.status = BAD_REQUEST_FORBIDDEN
			self._response(response, state)
		else:
			# inform processor
			if not state.processor:

			return

		try:
			statistics.requests.inactive()
			data = str(msg)
			# there is no data from another request in the send queue
			if not state.resend_queue:

		if socket not in self.__states:
			return

		statistics.connections.inactive()
		if self.__states[socket].username in statistics.users:
			statistics.users.remove(self.__states[socket].username)

		if self.__states[socket].processor is not None:
			self.__states[socket].processor.shutdown()


(-)a/ucs-4.0-0/management/univention-management-console/src/univention/management/console/protocol/session.py (-2 lines)

Lines 306-313 class Processor(signals.Provider):	Link Here

306

			self.handle_request_command(msg)

306

			self.handle_request_command(msg)

307

		elif msg.command == 'UPLOAD':

307

		elif msg.command == 'UPLOAD':

308

			self.handle_request_upload(msg)

308

			self.handle_request_upload(msg)

309

		elif msg.command in ('STATUS', 'CANCEL', 'CLOSE'):

310

			self.handle_request_unknown(msg)

311

		else:

309

		else:

312

			self.handle_request_unknown(msg)

310

			self.handle_request_unknown(msg)

313

311




# -*- coding: utf-8 -*-
#
# Univention Management Console
#  runtime statistics of the UMC server
#
# Copyright 2011-2014 Univention GmbH
#
# http://www.univention.de/
#
# All rights reserved.
#
# The source code of this program is made available
# under the terms of the GNU Affero General Public License version 3
# (GNU AGPL V3) as published by the Free Software Foundation.
#
# Binary versions of this program provided by Univention to you as
# well as other copyrighted, protected or trademarked materials like
# Logos, graphics, fonts, specific documentations and configurations,
# cryptographic keys etc. are subject to a license agreement between
# you and Univention and not subject to the GNU AGPL V3.
#
# In the case you use this program under the terms of the GNU AGPL V3,
# the program is provided in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public
# License with the Debian GNU/Linux or Univention distribution in file
# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.


class Counter(object):

	"""Implements a counter that counts available elements of
	any type that can be inactive."""

	def __init__(self):
		self._all = 0l
		self._active = 0l

	def new(self):
		"""Increase counter by one active element"""
		self._all += 1
		self._active += 1

	def inactive(self):
		"""Decrease counter of active elements by one"""
		self._active -= 1

	def json(self):
		"""Returns counter information in JSON compatible form"""
		return {'all': self._all, 'active': self._active}


class Statistics(object):

	"""Collects information about the connections, modules, requests and
	users processed and seen by the running UMC server instance"""
	connections = Counter()
	modules = Counter()
	requests = Counter()
	users = set()

	@staticmethod
	def json():
		"""Returns the statistics ina JSON compatible form"""
		return {
			'connections': Statistics.connections.json(),
			'modules': Statistics.modules.json(),
			'requests': Statistics.requests.json(),
			'users': list(Statistics.users)
		}

#: global :class:`Statistics` object
statistics = Statistics()

Return to bug 37458