Merge pull request #2731 from JuliaLang/backports-release-1.7

release-1.7 Revert "Make `write_env_usage` atomic (#2661)"

Author: KristofferC

.github/workflows/test.yml

@@ -29,8 +29,7 @@ jobs:
           - ""
           - "pkg.julialang.org"
         julia-version:
-          # - '1.6'
-          - 'nightly'
+          - "^1.7.0-0"
         exclude:
           - os: macOS-latest
             julia-arch: x86

src/Types.jl

@@ -464,50 +464,15 @@ function write_env_usage(source_file::AbstractString, usage_filepath::AbstractSt
     # Ensure that log dir exists
     !ispath(logdir()) && mkpath(logdir())
 
-    usage_file = joinpath(logdir(), usage_filepath)
-    timestamp = now()
-
-    ## Atomically write usage file
-    while true
-        # read existing usage file
-        usage = if isfile(usage_file)
-            TOML.parsefile(usage_file)
-        else
-            Dict{String, Any}()
-        end
-
-        # record new usage
-        usage[source_file] = [Dict("time" => timestamp)]
-
-        # keep only latest usage info
-        for k in keys(usage)
-            times = map(d -> Dates.DateTime(d["time"]), usage[k])
-            usage[k] = [Dict("time" => maximum(times))]
-        end
-
-        # Write to a temp file in the same directory as the destination
-        temp_usage_file = tempname(logdir())
-        open(temp_usage_file, "w") do io
-            TOML.print(io, usage, sorted=true)
-        end
-
-        # Move the temp file into place, replacing the original
-        mv(temp_usage_file, usage_file, force = true)
+    # Generate entire entry as a string first
+    entry = sprint() do io
+        TOML.print(io, Dict(source_file => [Dict("time" => now())]))
+    end
 
-        # Check that the new file has what we want in it
-        new_usage = if isfile(usage_file)
-            TOML.parsefile(usage_file)
-        else
-            Dict{String, Any}()
-        end
-        if haskey(new_usage, source_file)
-            for e in new_usage[source_file]
-                if Dates.DateTime(e["time"]) >= timestamp
-                    return
-                end
-            end
-        end
-        # If not, try again
+    # Append entry to log file in one chunk
+    usage_file = joinpath(logdir(), usage_filepath)
+    open(usage_file, append=true) do io
+        write(io, entry)
     end
 end