Model logs

Author: jginternational

kratos.gid/kratos.tcl

@@ -148,6 +148,8 @@ proc Kratos::InitGlobalVariables {dir} {
     set Kratos::kratos_private(allow_logs) 1
     # git hash of the problemtype
     set Kratos::kratos_private(problemtype_git_hash) 0    
+    # Place were the logs will be placed
+    set Kratos::kratos_private(model_log_folder) ""
 
     # Variable to store the Kratos menu items
     set kratos_private(MenuItems) [dict create]
@@ -222,6 +224,8 @@ proc Kratos::Event_LoadModelSPD { filespd } {
     set old_doc [gid_groups_conds::open_XML_file_gzip $filespd]
     set old_root [$old_doc documentElement]
     set old_versionData [$old_root @version]
+    set version_data [dict create model_version $old_versionData ]
+    Kratos::Log "Load model -> [write::tcl2json $version_data]"
 
     # Compare the version number
     if { [package vcompare $versionPT $old_versionData] != 0 } {
@@ -252,6 +256,8 @@ proc Kratos::Event_LoadModelSPD { filespd } {
 
         # Open the tree
         spdAux::OpenTree
+
+        after 500 {set ::Kratos::kratos_private(model_log_folder) [file join [GiD_Info Project ModelName].gid Logs]}
     }
 }
 
@@ -262,6 +268,9 @@ proc Kratos::Event_EndProblemtype { } {
         GiD_UnRegisterEvents PROBLEMTYPE Kratos
     }
     if {[array exists ::Kratos::kratos_private]} {
+        # Close the log and moves them to the folder
+        Kratos::FlushLog 
+
         # Restore GiD variables that were modified by kratos and must be restored (maybe mesher)
         Kratos::RestoreVariables
 
@@ -506,7 +515,9 @@ proc Kratos::Event_SaveModelSPD { filespd } {
     apps::ExecuteOnCurrentApp AfterSaveModel $filespd
 
     # Log it
+    set Kratos::kratos_private(model_log_folder) [file join [GiD_Info Project ModelName].gid Logs]
     Kratos::Log "Save model $filespd"
+
 }
 
 

kratos.gid/scripts/Logs.tcl

@@ -35,14 +35,15 @@ proc Kratos::InitLog { } {
 proc Kratos::Log {msg} {
     variable kratos_private
 
-    if {! $Kratos::kratos_private(allow_logs)} {return ""}
+    if {[info exists kratos_private(Log)] &&  $Kratos::kratos_private(allow_logs) > 0} {
 
-    if {[info exists kratos_private(Log)]} {
-        lappend kratos_private(Log) "*~* [clock format [clock seconds] -format {%Z %Y-%m-%d %H:%M:%S }] | $msg"
+        if {[info exists kratos_private(Log)]} {
+            lappend kratos_private(Log) "*~* [clock format [clock seconds] -format {%Z %Y-%m-%d %H:%M:%S }] | $msg"
 
-        # One of the triggers is to flush if we've stored more than 5 
-        if {[llength $kratos_private(Log)] > 5} {
-            Kratos::FlushLog
+            # One of the triggers is to flush if we've stored more than 5 
+            if {[llength $kratos_private(Log)] > 5} {
+                Kratos::FlushLog
+            }
         }
     }
 }
@@ -51,6 +52,7 @@ proc Kratos::FlushLog { }  {
     variable kratos_private
 
     if {[info exists kratos_private(Log)]} {
+        # only disturb the disk if we have something new to write
         if {[llength $kratos_private(Log)] > 0} {
             set logpath [Kratos::GetLogFilePath]
 
@@ -66,14 +68,18 @@ proc Kratos::FlushLog { }  {
             }
 
             set kratos_private(Log) [list ]
+            # Move it to the model, so the user can see and store to get support
+            # Keep the original to keep centralized data to send to the servers
+            if {$Kratos::kratos_private(model_log_folder) ne ""} {
+                Kratos::MoveLogsToFolder $Kratos::kratos_private(model_log_folder) 0
+            }
         }
     }
 
 }
 
 proc Kratos::AutoFlush {} {
     if {! $Kratos::kratos_private(allow_logs)} {return ""}
-    Kratos::FlushLog
     after 5000 {Kratos::AutoFlush}
 }
 
@@ -88,3 +94,10 @@ if { [GiD_Set SaveGidDefaults] } {
     Kratos::InitLog
 }
 
+proc Kratos::MoveLogsToFolder {folder {flush_log 1}} {
+    
+    if {! $Kratos::kratos_private(allow_logs)} {return ""}
+    if {$flush_log} {FlushLog}
+    if {![file exists $folder]} {file mkdir $folder}
+    file copy -force [Kratos::GetLogFilePath] $folder
+}

kratos.gid/scripts/Utils.tcl

@@ -196,12 +196,11 @@ proc Kratos::LogInitialData { } {
     Kratos::GetProblemtypeGitTag 
 
     set initial_data [dict create]
-    dict set initial_data GiD_version [GiD_Info gidversion]
+    dict set initial_data gid_version [GiD_Info gidversion]
     dict set initial_data problemtype_git_hash $Kratos::kratos_private(problemtype_git_hash)
     dict set initial_data problemtype_version $Kratos::kratos_private(Version)
     dict set initial_data executable_version $Kratos::kratos_private(exec_version)
     dict set initial_data current_platform $::tcl_platform(platform)
-    dict set initial_data gid_version [GiD_Info gidversion]
 
     Kratos::Log [write::tcl2json $initial_data]
 }