From ec03848d2f1b37533a638088f70ffdcbdc33df8d Mon Sep 17 00:00:00 2001
From: anastasia <lubennikovaav@gmail.com>
Date: Fri, 23 Jul 2021 16:22:01 +0300
Subject: [PATCH] Fix pageserver.log destination for zenith init. The problem
 was caused by merge conflict in 767590b

---
 pageserver/src/branches.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pageserver/src/branches.rs b/pageserver/src/branches.rs
index 802f942636..a33597bb2d 100644
--- a/pageserver/src/branches.rs
+++ b/pageserver/src/branches.rs
@@ -47,11 +47,13 @@ pub fn init_pageserver(
     workdir: &Path,
     create_tenant: Option<&str>,
 ) -> Result<()> {
+
+    env::set_current_dir(workdir)?;
+
     // Initialize logger
     let (_scope_guard, _log_file) = logger::init_logging(&conf, "pageserver.log")?;
     let _log_guard = slog_stdlog::init()?;
 
-    env::set_current_dir(workdir)?;
     if let Some(tenantid) = create_tenant {
         let tenantid = ZTenantId::from_str(tenantid)?;
         println!("initializing tenantid {}", tenantid);