diff --git a/twenty-server/lib/twenty-server.rb b/twenty-server/lib/twenty-server.rb index 03b746e..96c2b3e 100644 --- a/twenty-server/lib/twenty-server.rb +++ b/twenty-server/lib/twenty-server.rb @@ -4,13 +4,12 @@ module Twenty require "fileutils" require "sequel" require_relative "twenty-server/path" - extend Path ## # @return [String] # Returns the location of the default SQLite database. def self.default_database - @default_database ||= File.join(datadir, "database.sqlite") + @default_database ||= File.join(Path.datadir, "database.sqlite") end ## @@ -32,13 +31,7 @@ module Twenty @connection end - begin - FileUtils.mkdir_p(datadir) - FileUtils.mkdir_p(tmpdir) - FileUtils.touch(default_database) - rescue => ex - warn "prepare_dir error: #{ex.message} (#{ex.class})" - end + FileUtils.touch(default_database) require_relative "twenty-server/graphql" require_relative "twenty-server/rack" end diff --git a/twenty-server/lib/twenty-server/path.rb b/twenty-server/lib/twenty-server/path.rb index 8e5612d..9bd2b1a 100644 --- a/twenty-server/lib/twenty-server/path.rb +++ b/twenty-server/lib/twenty-server/path.rb @@ -1,6 +1,9 @@ # frozen_string_literal: true module Twenty::Path + require "tmpdir" + extend self + ## # @return [String] # Returns the directory where twenty stores persistent data. @@ -22,4 +25,7 @@ module Twenty::Path def pidfile File.join(tmpdir, "server.pid") end + + FileUtils.mkdir_p(datadir) + FileUtils.mkdir_p(tmpdir) end