Changeset 908

Timestamp:

May 26, 2016, 9:02:53 AM (9 years ago)

Author:

Herwig Bauernfeind

Message:

GUITools: SMBMon (TDB Check page), shared library updates

Location:

trunk/guitools

Files:

• shared/sambainit.vrs (modified) (1 diff)
• smbmon/changes (modified) (1 diff)
• smbmon/rc/lang/smbmon_de.mkm (modified) (1 diff)
• smbmon/rc/lang/smbmon_en.mkm (modified) (1 diff)
• smbmon/rc/lang/smbmon_es.mkm (modified) (1 diff)
• smbmon/rc/lang/smbmon_fr.mkm (modified) (1 diff)
• smbmon/rc/lang/smbmon_sv.mkm (modified) (1 diff)
• smbmon/smbmon.vrp (modified) (1 diff)
• smbmon/smbmon.vrx (modified) (8 diffs)
• smbmon/smbmon.vry (modified) ( previous)

trunk/guitools/shared/sambainit.vrs

@@ -190 +190 @@
     if samba.!log = "" then do /* new default */
         ok = SysFileTree(etc'\samba\log',exist.,'DO')
-        if exist.0 > 0 then samba.!log = etc'\samba\logs'
+        if exist.0 > 0 then samba.!log = etc'\samba\log'
     end
     if samba.!log = "" then do /* old default */

trunk/guitools/smbmon/changes

@@ +1 @@
+Version 2.5.RC   08-2015
+                        +Added:   execute smbsched.cmd upon every refresh.
 Version 2.5.beta 02-2012
                         +Added:   Delete old logs

trunk/guitools/smbmon/rc/lang/smbmon_de.mkm

@@ -162 +162 @@
 SMM0150I: Arbeitsgruppe
 SMM0151I: Kommentar
-SMM0152?: 
+SMM0152I: DateigrӇe
 SMM0153?: 
 SMM0154?: 

trunk/guitools/smbmon/rc/lang/smbmon_en.mkm

@@ -162 +162 @@
 SMM0150I: Workgroup
 SMM0151I: Comment
-SMM0152?: 
+SMM0152I: Filesize
 SMM0153?: 
 SMM0154?: 

trunk/guitools/smbmon/rc/lang/smbmon_es.mkm

@@ -162 +162 @@
 SMM0150I: Grupo de trabajo
 SMM0151I: Commentario
-SMM0152?: 
+SMM0152I: Tama€o de archivo
 SMM0153?: 
 SMM0154?: 

trunk/guitools/smbmon/rc/lang/smbmon_fr.mkm

@@ -167 +167 @@
 SMM0150I: Groupe de travail
 SMM0151I: Commentaires
-SMM0152?: 
+SMM0152I: Taille du fichier
 SMM0153?: 
 SMM0154?: 

trunk/guitools/smbmon/rc/lang/smbmon_sv.mkm

@@ -162 +162 @@
 SMM0150I: Arbeta
 SMM0151I: Kommentera
-SMM0152?: 
+SMM0152I: Filstorlek
 SMM0153?: 
 SMM0154?: 

trunk/guitools/smbmon/smbmon.vrp

@@ -7 +7 @@
 RunDirectory: U:\Develop\Samba\trunk\guitools\smbmon
 VRXWindow: __VREMainWindow,1,2180,3614,1024,6769
-VRXWindow: __VRESectionListWindow,1,4083,11226,7372,6589
-VRXWindow: __VREToolsWindow,1,2156,1494,5477,1663
+VRXWindow: __VRESectionListWindow,1,4083,11226,7372,7685
+VRXWindow: __VREToolsWindow,1,2156,1494,5474,1665
 VRXWindow: __VREWindListWindow,1,964,11708,5372,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_FILES,1
-UserWindow: SW_CHKTDB,1
+UserWindow: SW_DAEMONS,1

trunk/guitools/smbmon/smbmon.vrx

@@ -107 +107 @@
 ok = VRMethod("CN_CHKTDB", "RemoveRecord", "ALL")
 
+RecHandleArray.0 = 0
+ok = VRSet("CN_CHKTDB", "Painting", 0)
+
 do I = 1 to tdb.0
-    RecHandle = VRMethod("CN_CHKTDB", "Addrecord")
+    RecHandleArray.I = VRMethod("CN_CHKTDB", "Addrecord")
+end
+ok = VRSet("CN_CHKTDB", "Painting", 1)
+
+/* ok = VRSet("CN_CHKTDB", "Painting", 0) */
+
+do I = 1 to tdb.0
+    RecHandle = RecHandleArray.I
     TDBFile =left(filespec('N',tdb.I), 22)
-    ok = VRMethod("CN_CHKTDB", "SetFieldData", RecHandle, ChkTDBFilesFH, TDBFile, ChkTDBIconFH, "$50" )
+    TDBSize = stream(tdb.I,'c','query size')
+    ok = VRMethod("CN_CHKTDB", "SetFieldData", RecHandle, ChkTDBFilesFH, TDBFile, ChkTDBIconFH, "$50", ChkTDBSizeFH, TDBSize||" Bytes" )
     address cmd '@tdbtool 'tdb.I' check 2>'tdb.I'.err 1>'tdb.I'.out'
     out = linein(tdb.I'.out')
@@ -142 +153 @@
         end
         ok = VRMethod("CN_CHKTDB", "SetFieldData", RecHandle, ChkTDBStatusFH, out )
+        ok = VRSet("CN_CHKTDB", "Painting", 1)
+        ok = VRSet("CN_CHKTDB", "Painting", 0)
+
         ok = stream(tdb.I'.err','c','close')
     end
@@ -177 +191 @@
 end
 
+ok = VRSet("CN_CHKTDB", "Painting", 1)
+
 return
 
@@ -251 +267 @@
     ChkTDBFilesFH = VRMethod( "CN_CHKTDB", "AddField", "String", NLVGetMessage(134) )
     ChkTDBIconFH  = VRMethod( "CN_CHKTDB", "AddField", "Icon",   NLVGetMessage(146) )
+    ChkTDBSizeFH  = VRMethod( "CN_CHKTDB", "AddField", "String", NLVGetMessage(152) )
     ChkTDBStatusFH= VRMethod( "CN_CHKTDB", "AddField", "String", NLVGetMessage(151) )
 
@@ -567 +584 @@
 */
 _INIWrite: 
-    say 'start _INIWrite()'
+    IF options.!debug == 1 then say time()' _INIWrite() started'
     ok = VRSetIni( "Pos", "Top",          VRGet("Main","Top"),         OurINI, 'NoClose' )
     ok = VRSetIni( "Pos", "Left",         VRGet("Main","Left"),        OurINI, 'NoClose' )
@@ -605 +622 @@
     ok = VRSetIni( "Fonts", "Statusfont", VRGet("DT_StatusBar","Font"),OurINI, 'NoClose' )
     ok = VRSetIni( "Fonts", "Main",       VRGet("Main","Font"),        OurINI )
-    say 'done _INIWrite()'
+    IF options.!debug == 1 then say time()' _INIWrite() done'
 return
 
@@ -869 +886 @@
     ok = stream(refresherr, 'c','close')
     ok = SysFileDelete(refreshouterr)
+    if VRFileExists( samba.!bin"\smbsched.cmd" ) then do
+        address cmd samba.!bin"\smbsched.cmd"
+    end
 
     call _RefreshDaemons
@@ -1198 +1218 @@
     if uS <> 0 | UpTimeStr = ' 'NlvGetMessage(43)':' then UpTimeStr = UpTimeStr' 'uS' 'NlvGetMessage(49)
 
-    ok = VRset("CN_Daemons", "Caption", UpTimeStr)
+    loggingfreespace = word(sysdriveinfo(left(samba.!log,2)),2)%1024%1024
+
+    ok = VRset("CN_Daemons", "Caption", UpTimeStr' 'loggingfreespace' MB')
+
+    select
+        when loggingfreespace <  50 then ok = VRDeleteFile(samba.!log'\log.*')
+        when loggingfreespace < 100 then ok = VRset("CN_Daemons","BackColor","Red")
+        when loggingfreespace < 200 then ok = VRset("CN_Daemons","BackColor","Yellow")
+        otherwise ok = VRset("CN_Daemons","BackColor","SystemWindow")       
+    end
 
     IF options.!debug == 1 then say time()' _SambaUptime() done'