From 81f76c44a852e334c56f835ad87d480c3c7a943e Mon Sep 17 00:00:00 2001
From: Ayush Saini <ayushsaini8697@gmail.com>
Date: Sat, 8 Oct 2022 22:21:54 +0530
Subject: [PATCH] changing device name for servers

---
 assets/src/server/ballisticacore_server.py | 5 +++++
 src/ballistica/platform/platform.cc        | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/assets/src/server/ballisticacore_server.py b/assets/src/server/ballisticacore_server.py
index 821e1285..b6be1932 100755
--- a/assets/src/server/ballisticacore_server.py
+++ b/assets/src/server/ballisticacore_server.py
@@ -573,6 +573,11 @@ class ServerManagerApp:
         # slight behavior tweaks. Hmm; should this be an argument instead?
         os.environ['BA_SERVER_WRAPPER_MANAGED'] = '1'
 
+        # Set an environment var to change the device name.
+        # Device name is used while making connection with master server,
+        # cloud-console recognize us with this name.
+        os.environ['BA_HOST_NAME'] = self._config.party_name
+
         print(f'{Clr.CYN}Launching server subprocess...{Clr.RST}', flush=True)
         binary_name = ('BallisticaCoreHeadless.exe'
                        if os.name == 'nt' else './ballisticacore_headless')
diff --git a/src/ballistica/platform/platform.cc b/src/ballistica/platform/platform.cc
index 56d0c959..d2afd4cf 100644
--- a/src/ballistica/platform/platform.cc
+++ b/src/ballistica/platform/platform.cc
@@ -499,7 +499,14 @@ auto Platform::GetDeviceName() -> std::string {
 }
 
 auto Platform::DoGetDeviceName() -> std::string {
-  // Just go with hostname as a decent default.
+  // Check hostname in env_var
+  char* hostname;
+  hostname = getenv("BA_HOST_NAME");
+  if (hostname != NULL) {
+    return hostname;
+  }
+
+  // Else just go with hostname as a decent default.
   char nbuffer[64];
   int ret = gethostname(nbuffer, sizeof(nbuffer));
   if (ret == 0) {