From f460ca1bb563fee27564c70126219b79fb29cc81 Mon Sep 17 00:00:00 2001
From: nanotube <nanotube>
Date: Wed, 24 Oct 2007 16:11:01 +0000
Subject: [PATCH] -clean up deprecated stuff out of the config files -more
 logically organize config files

---
 logwriter.py    |  12 +++---------
 pykeylogger.ini | Bin 8381 -> 7060 bytes
 pykeylogger.val |  28 +++++++---------------------
 3 files changed, 10 insertions(+), 30 deletions(-)

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 7afad6015debfc358e953f6a7f62e828f36bc320..76abb8ce5bd9eefe9a594e2eec58ea3a5226d06f 100644
GIT binary patch
delta 52
zcmV-40L%ZqL6kSJxB`>v0?3o@1O~HU1R(>n^$0xzvqlVU3A1+>RR;t_L0MCi&>q;6
Kv<s4xG7EqzeiRA-

delta 1287
zcmbtU!D<vi5XEfJxS)a&B#KzcUKHXaQ9%&)5J*B+-CTA>B!<wLuF15S=^na!vaXlS
z$+Ix|3QvK(<l^0ncR#?N@E}+<n`C#@i*XJ!J>6CHUcIX7!zZ7YkB%oEHasW?7DJP!
zs3l79vGC9}Iiz9_>5q?vkI{mQjrBosJn<!5mJ(hljj)E~(l#dXDuX)kenR^ZZ*RWQ
zTM)*=iqMmLCq@mSuvUp(BuJlIO*VGahQK6xBzswWt=zdXhEx2g%=SN2W-GlKJs_16
zI|<5a4O$t7D(VtjggvCMfy|<Fyoi$A#n7?JBkbf+L`-;BB?$LorTtU>J&DE6^YAuz
z9vpf;5TK35cglIxo{s|x(kr8MRFZ)6{NBL<3?(gcZ&Kk^D3YWb+$VApBatVBv$nKU
zt(A11WA{X}`gy4L{)79!P(S5bXXYcB^p7q+o+xhIJ}3@u9rnLZrI*Jm5|r|4k>aV0
ziP_!Wl)~dy@LpxVRg7y<8b^j|LnR~=5H^g}J~tq>V<|O>jHw`7>QTcTI>M+2gg|bC
z=(JcKxNi`LzbSoQ$N=UBY0RB*vX~{J7ZR(E@-c+DwcIM4?1EP$fzr@yuB^PKXM26U
z*=)6d5~Usqpb-t@QR{2t%f2Q5c~HZ&h2+5`9atQiQZP}uJk4SrR)k{*jzN=0#w=xK
zO-9|$FKS4mgKBMDnfiEHiVKs|eQ|yD(xen!SA3fJ_F%J388|P}Y-_Xuplx%ko}Iy}
z=1DB>PTwp(UcL5;0F{v{1kS(oCU&}{Oo+_d1%G(c?NLS@sVY2L3>Jrm#m||UVqtpf
n*+5mgQ}zYVp6?*tEUe8CkMtwi8yhd%tF2M2hCXqtm%)Dld}zf{

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