From 6e59e791b7b4d1184e70378544b6ace433ab33aa Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Mon, 27 Jun 2022 17:23:03 -0400 Subject: Quick switch to more reasonable example config paths. Log file is now checked for allocated filename before dealocation. --- captain/example/levitating.conf | 22 +++++++++++----------- captain/log.f90 | 4 +++- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/captain/example/levitating.conf b/captain/example/levitating.conf index 06b89ed..5f4f612 100644 --- a/captain/example/levitating.conf +++ b/captain/example/levitating.conf @@ -1,9 +1,9 @@ -template-directory = /home/jeff/workspace/levitating/captain/templates +template-directory = /home/jeff/Workspace/levitating/captain/templates -database = /home/jeff/workspace/levitating/captain/example/store.db +database = /home/jeff/Workspace/levitating/captain/example/store.db -log-filename = /home/jeff/workspace/levitating/captain/example/log/levitating.log +log-filename = /home/jeff/Workspace/levitating/captain/example/log/levitating.log log-level = 10 @@ -11,21 +11,21 @@ project = misc-build description = A builder for stuff -public-cert = /home/jeff/workspace/levitating/captain/example/pub.crt +public-cert = /home/jeff/Workspace/levitating/captain/example/pub.crt -private-cert = /home/jeff/workspace/levitating/captain/example/priv.key +private-cert = /home/jeff/Workspace/levitating/captain/example/priv.key -uploads-directory = /home/jeff/workspace/levitating/captain/example/uploads +uploads-directory = /home/jeff/Workspace/levitating/captain/example/uploads -results-directory = /home/jeff/workspace/levitating/captain/example/results +results-directory = /home/jeff/Workspace/levitating/captain/example/results -static-directory = /home/jeff/workspace/levitating/captain/example/static +static-directory = /home/jeff/Workspace/levitating/captain/example/static -script-directory = /home/jeff/workspace/levitating/captain/sql +script-directory = /home/jeff/Workspace/levitating/captain/sql -instructions-directory = /home/jeff/workspace/levitating/captain/example/instructions +instructions-directory = /home/jeff/Workspace/levitating/captain/example/instructions -release-directory = /home/jeff/workspace/levitating/captain/example/releases +release-directory = /home/jeff/Workspace/levitating/captain/example/releases temp-directory = /tmp/levitating diff --git a/captain/log.f90 b/captain/log.f90 index 2bc183f..70314c2 100644 --- a/captain/log.f90 +++ b/captain/log.f90 @@ -50,7 +50,9 @@ contains subroutine shutdown() implicit none - deallocate(logfile) + if(associated(logfile)) then + deallocate(logfile) + end if logfile => null() end subroutine shutdown -- cgit v1.2.3