[Moin-devel] CVS: MoinMoin editlog.py,1.14,1.15 eventlog.py,1.7,1.8 wikimacro.py,1.33,1.34

[J?rgen Hermann]

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv30075

Modified Files:
	editlog.py eventlog.py wikimacro.py 
Log Message:
Size of editlog; entries & size of event log


Index: editlog.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/editlog.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** editlog.py	13 Feb 2002 21:13:52 -0000	1.14
--- editlog.py	12 Mar 2002 04:09:00 -0000	1.15
***************
*** 120,128 ****
  
      def __init__(self, **kw):
          self._lines = self._editlog_raw_lines()
          if not kw.get('reverse', 0):
              self._lines.reverse()
-         self._index = 0
-         self._usercache = {}
  
          # set default member values
--- 120,130 ----
  
      def __init__(self, **kw):
+         self._index = 0
+         self._usercache = {}
+         self._filename = os.path.join(config.data_dir, 'editlog')
+ 
          self._lines = self._editlog_raw_lines()
          if not kw.get('reverse', 0):
              self._lines.reverse()
  
          # set default member values
***************
*** 211,214 ****
--- 213,224 ----
  
  
+     def size(self):
+         """ Return size in bytes.
+         """
+         try:
+             return os.path.getsize(self._filename)
+         except os.error:
+             return 0
+ 
      def __len__(self):
          return len(self._lines)
***************
*** 225,231 ****
      def _editlog_raw_lines(self):
          """ Load a list of raw editlog lines """
-         editlog_name = os.path.join(config.data_dir, 'editlog') #!!! self.filename
          try:
!             logfile = open(editlog_name, 'rt')
              try:
                  # fcntl.flock(logfile.fileno(), fcntl.LOCK_SH)
--- 235,240 ----
      def _editlog_raw_lines(self):
          """ Load a list of raw editlog lines """
          try:
!             logfile = open(self._filename, 'rt')
              try:
                  # fcntl.flock(logfile.fileno(), fcntl.LOCK_SH)

Index: eventlog.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/eventlog.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** eventlog.py	13 Feb 2002 21:13:52 -0000	1.7
--- eventlog.py	12 Mar 2002 04:09:00 -0000	1.8
***************
*** 26,29 ****
--- 26,30 ----
  
      def __init__(self):
+         self._filename = os.path.join(config.data_dir, 'event.log')
          self._logfile = None
          self._ua_match = None
***************
*** 34,38 ****
      def _write(self, data):
          if not self._logfile:
!             self._logfile = open(os.path.join(config.data_dir, 'event.log'), 'a')
          self._logfile.write(data + "\n")
          self._logfile.flush()
--- 35,39 ----
      def _write(self, data):
          if not self._logfile:
!             self._logfile = open(self._filename, 'a')
          self._logfile.write(data + "\n")
          self._logfile.flush()
***************
*** 61,65 ****
              `filter` -- list of eventtypes to filter for
          """
!         file = open(os.path.join(config.data_dir, 'event.log'), 'r')
          events = file.readlines()
          file.close()
--- 62,66 ----
              `filter` -- list of eventtypes to filter for
          """
!         file = open(self._filename, 'r')
          events = file.readlines()
          file.close()
***************
*** 72,75 ****
--- 73,84 ----
  
          return data
+ 
+     def size(self):
+         """ Return size in bytes.
+         """
+         try:
+             return os.path.getsize(self._filename)
+         except os.error:
+             return 0
  
  

Index: wikimacro.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikimacro.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** wikimacro.py	6 Mar 2002 22:36:52 -0000	1.33
--- wikimacro.py	12 Mar 2002 04:09:00 -0000	1.34
***************
*** 206,209 ****
--- 206,210 ----
      def _macro_SystemInfo(self, args):
          from cStringIO import StringIO
+         from MoinMoin import eventlog
  
          # check for 4XSLT
***************
*** 228,232 ****
          row(_('Number of pages'), len(wikiutil.getPageList(config.text_dir)))
          row(_('Number of backup versions'), len(wikiutil.getBackupList(config.backup_dir, None)))
!         row(_('Entries in edit log'), len(editlog.EditLog()))
          row(_('Global extension macros'), 
              string.join(macro.extension_macros, ', ') or _("<b>NONE</b>"))
--- 229,237 ----
          row(_('Number of pages'), len(wikiutil.getPageList(config.text_dir)))
          row(_('Number of backup versions'), len(wikiutil.getBackupList(config.backup_dir, None)))
!         edlog = editlog.EditLog()
!         row(_('Entries in edit log'), _("%(logcount)s (%(logsize)s bytes)") %
!             {'logcount': len(edlog), 'logsize': edlog.size()})
!         row(_('Entries in event log'), _("%(logcount)s (%(logsize)s bytes)") %
!             {'logcount': len(eventlog.logger.read()), 'logsize': eventlog.logger.size()})
          row(_('Global extension macros'), 
              string.join(macro.extension_macros, ', ') or _("<b>NONE</b>"))