-clean up deprecated stuff out of the config files

nanotube [2007-10-24 16:11]
-clean up deprecated stuff out of the config files
-more logically organize config files
Filename
logwriter.py
pykeylogger.ini
pykeylogger.val
diff --git a/logwriter.py b/logwriter.py
index 5c60baf..f97bd66 100644
--- a/logwriter.py
+++ b/logwriter.py
@@ -121,15 +121,9 @@ class LogWriter:
 		if self.settings['Log Maintenance']['Delete Old Logs'] == True:
 			self.oldlogtimer = mytimer.MyTimer(float(self.settings['Log Maintenance']['Age Check Interval'])*60*60, 0, self.DeleteOldLogs)
 			self.oldlogtimer.start()
-
-		## don't need anymore with the delimited log format
-		# initialize the automatic timestamp timer
-		#~ if self.settings['Timestamp']['Timestamp Enable'] == True:
-			#~ self.timestamptimer = mytimer.MyTimer(float(self.settings['Timestamp']['Timestamp Interval'])*60, 0, self.WriteTimestamp)
-			#~ self.timestamptimer.start()
-
+
 		# initialize the automatic log flushing timer
-		self.flushtimer = mytimer.MyTimer(float(self.settings['General']['Flush Interval']), 0, self.FlushLogWriteBuffers, ["Flushing file write buffers due to timer\n"])
+		self.flushtimer = mytimer.MyTimer(float(self.settings['Log Maintenance']['Flush Interval']), 0, self.FlushLogWriteBuffers, ["Flushing file write buffers due to timer\n"])
 		self.flushtimer.start()

 		# start the event queue processing
@@ -143,7 +137,7 @@ class LogWriter:
 			self.ziptimer.start()

 		# initialize the log rotation job
-		self.logrotatetimer = mytimer.MyTimer(float(self.settings['General']['Log Rotation Interval'])*60*60, 0, self.RotateLogs)
+		self.logrotatetimer = mytimer.MyTimer(float(self.settings['Log Maintenance']['Log Rotation Interval'])*60*60, 0, self.RotateLogs)
 		self.logrotatetimer.start()


diff --git a/pykeylogger.ini b/pykeylogger.ini
index 7afad60..76abb8c 100644
Binary files a/pykeylogger.ini and b/pykeylogger.ini differ
diff --git a/pykeylogger.val b/pykeylogger.val
index c9c4072..777c121 100644
--- a/pykeylogger.val
+++ b/pykeylogger.val
@@ -14,10 +14,6 @@ Log Directory = string(max=64, default="C:\Temp\logdir")
 Hook Keyboard Tooltip = string()
 Hook Keyboard = boolean(default=True)

-# default: False
-Add Line Feed Tooltip = string()
-Add Line Feed = boolean(default=False)
-
 # default: False
 Parse Backspace Tooltip = string()
 Parse Backspace = boolean(default=False)
@@ -28,7 +24,7 @@ Parse Escape = boolean(default=False)

 # default: F12
 Control Key Tooltip = string()
-Control Key = string(default="F12")
+Control Key = string(default="Lcontrol;Rcontrol;F12")

 # default: None
 Applications Not Logged Tooltip = string()
@@ -42,14 +38,6 @@ Log File = string(default="logfile.txt")
 Log File Field Separator Tooltip = string()
 Log File Field Separator = string(default="|")

-# default: 4.0
-Log Rotation Interval Tooltip = string()
-Log Rotation Interval = float(min=0.016, default=4.0)
-
-# default: 120
-Flush Interval Tooltip = string()
-Flush Interval = float(min=10, default=120.0)
-
 # default: None
 System Log Tooltip = string()
 System Log = string(default=None)
@@ -173,12 +161,10 @@ Max Log Age = float(min=0.00069, default=2.0)
 Age Check Interval Tooltip = string(default="Set to the frequency of checking for and deleting logs older than maxLogAge, in HOURS.")
 Age Check Interval = float(min=0.016, default=2.0)

-[Timestamp]
-
-# default: True
-Timestamp Enable Tooltip = string(default="Set this to True to enable periodic timestamps in the logfiles.")
-Timestamp Enable = boolean(default=True)
+# default: 120
+Flush Interval Tooltip = string()
+Flush Interval = float(min=10, default=120.0)

-# default: 30.0
-Timestamp Interval Tooltip = string(default="Set this to time interval between the timestamps, in MINUTES.")
-Timestamp Interval = float(min=0.016, default=30.0)
\ No newline at end of file
+# default: 4.0
+Log Rotation Interval Tooltip = string()
+Log Rotation Interval = float(min=0.016, default=4.0)
\ No newline at end of file
ViewGit