Merge pull request #1 in SWGNXT/src from remove_station_references to master

* commit 'a78824475d7f4b62df29792e894ba438e0ace617':
  remove potential outgoing mail
  replace all references to station.sony.com by localnet.loc
This commit is contained in:
Anonymous
2014-11-29 10:22:05 -05:00
11 changed files with 17 additions and 17 deletions
@@ -121,7 +121,7 @@ void ConfigCentralServer::install(void)
KEY_INT (systemTimeMismatchAlertIntervalSeconds, 1*60*60); // seconds
KEY_INT (ctsDenyLoginThresholdSeconds, 2*60*60); // seconds
KEY_BOOL (auctionEnabled, false);
KEY_STRING (auctionServer, "sdt-plattestsys2.station.sony.com");
KEY_STRING (auctionServer, "sdt-plattestsys2.localnet.loc");
KEY_INT (auctionPort, 5901 );
KEY_STRING (auctionIDPrefix, "SWG+");
KEY_BOOL (disconnectDuplicateConnectionsOnOtherGalaxies, false);
@@ -73,13 +73,13 @@ void ConfigChatServer::install(void)
data = new ConfigChatServer::Data;
KEY_STRING (backupGatewayServerIP, "swo-dev8.station.sony.com");
KEY_STRING (backupGatewayServerIP, "swo-dev8.localnet.loc");
KEY_INT (backupGatewayServerPort, 15150);
KEY_STRING (clusterName, "devcluster");
KEY_STRING (centralServerAddress, "swo-dev8.station.sony.com");
KEY_STRING (centralServerAddress, "swo-dev8.localnet.loc");
KEY_INT (centralServerPort, 61232);
KEY_STRING (gameCode, "SWG");
KEY_STRING (gatewayServerIP, "sdplatdev1.station.sony.com");
KEY_STRING (gatewayServerIP, "sdplatdev1.localnet.loc");
KEY_INT (gatewayServerPort, 5001);
KEY_INT (roomInactivityTimeout, 60 * 60 * 24 * 3);
KEY_INT (roomUnpopulatedTimeout, 60 * 5);
@@ -88,7 +88,7 @@ void ConfigChatServer::install(void)
KEY_INT (loginFlowControlRate, 50);
KEY_INT (maxRoomQueriesPerFrame, 5);
KEY_BOOL (loggingEnabled, false);
KEY_STRING (registrarHost, "sdplatdev1.station.sony.com");
KEY_STRING (registrarHost, "sdplatdev1.localnet.loc");
KEY_INT (registrarPort, 5000);
KEY_INT (intervalToSendHeadersToClientSeconds, 1);
KEY_INT (maxHeadersToSendToClientPerInterval, 100);
@@ -56,7 +56,7 @@ void ConfigConnectionServer::install(void)
data = new ConfigConnectionServer::Data;
KEY_STRING (centralServerAddress, "swo-dev5.station.sony.com");
KEY_STRING (centralServerAddress, "swo-dev5.localnet.loc");
KEY_INT (centralServerPort, 0);
KEY_STRING (clientServiceBindInterface, "");
KEY_INT (clientServicePortPrivate, 44464);
@@ -45,10 +45,10 @@ void ConfigCustomerServiceServer::install()
SetupSharedNetwork::install(networkSetupData);
KEY_STRING (clusterName, "devcluster");
KEY_STRING (centralServerAddress, "swo-dev8.station.sony.com");
KEY_STRING (centralServerAddress, "swo-dev8.localnet.loc");
KEY_INT (centralServerPort, 61242);
KEY_STRING (gameCode, "SWG");
KEY_STRING (csServerAddress, "sdlogin1.station.sony.com");
KEY_STRING (csServerAddress, "sdlogin1.localnet.loc");
KEY_INT (csServerPort, 3016);
KEY_INT (maxPacketsPerSecond, 50);
KEY_INT (requestTimeoutSeconds, 300);
@@ -31,7 +31,7 @@ void ConfigPlanetServer::install(void)
data = new ConfigPlanetServer::Data;
KEY_STRING (centralServerAddress, "swo-dev1.station.sony.com");
KEY_STRING (centralServerAddress, "swo-dev1.localnet.loc");
KEY_INT (centralServerPort, 44455);
KEY_STRING (sceneID, "default");
KEY_INT (gameServicePort, 0);
@@ -63,7 +63,7 @@ void ConfigTaskManager::install(void)
KEY_INT (gameServicePort, 60001);
KEY_INT (consoleConnectionPort, 60000);
KEY_STRING (consoleServiceBindInterface, "");
KEY_STRING (loginServerAddress, "swo-dev5.station.sony.com");
KEY_STRING (loginServerAddress, "swo-dev5.localnet.loc");
KEY_INT (loginServerTaskServicePort, 44459);
KEY_FLOAT (maximumLoad, 3.0f);
KEY_FLOAT (loadConnectionServer, 0.5f);
@@ -49,9 +49,9 @@ void ConfigServerDatabase::install(void)
KEY_STRING (databaseUID,"gameserver");
KEY_STRING (databasePWD,"gameserver");
KEY_STRING (databaseProtocol,"DEFAULT");
KEY_STRING (centralServerAddress, "swo-dev1.station.sony.com");
KEY_STRING (centralServerAddress, "swo-dev1.localnet.loc");
KEY_INT (centralServerPort, 44451);
KEY_STRING (commoditiesServerAddress, "swo-dev1.station.sony.com");
KEY_STRING (commoditiesServerAddress, "swo-dev1.localnet.loc");
KEY_INT (commoditiesServerPort, 44457); //todo: confirm that this is a good port MSH
KEY_INT (taskManagerPort, 60001);
KEY_INT (expectedDBVersion, 270);
@@ -50,7 +50,7 @@ void ConfigServerGame::install(void)
KEY_FLOAT (startZ, 0.0f);
startingPosition = Vector(data->startX,data->startY,data->startZ);
KEY_INT (taskManagerPort, 60001);
KEY_STRING (centralServerAddress, "swo-dev1.station.sony.com");
KEY_STRING (centralServerAddress, "swo-dev1.localnet.loc");
KEY_INT (centralServerPort, 44451);
KEY_STRING (javaVMName, "");
KEY_STRING (scriptPath, "../../data/sku.0/sys.server/compiled/game");
@@ -457,7 +457,7 @@ int main(int argc, char **argv)
#ifdef AUTO_RUN
ResetGlobals();
serverhost = "sdplatdev2.station.sony.com";
serverhost = "sdplatdev2.localnet.loc";
//serverhost = "64.37.152.161";
//serverport = 3018;
//serverhost = "64.37.153.15";
@@ -8,7 +8,7 @@
const unsigned short EMPTY_STRING[1] = { 0 };
const char * DEFAULT_GAMECODE = "ZZZ";
const char * DEFAULT_HOST = "ctservice.station.sony.com";
const char * DEFAULT_HOST = "ctservice.localnet.loc";
const unsigned short DEFAULT_PORT = 2000;
namespace CTService
@@ -394,7 +394,7 @@ sub doDeltaUpdates
{
$sqlcommand=&sqlplus;
$user=$1 if ($sqlcommand =~ /sqlplus (\w+)\//);
system("echo need to create login $user | /bin/mail -s 'create login $user' aus-db\@soe.sony.com");
#system("echo need to create login $user | /bin/mail -s 'create login $user' aus-db\@soe.sony.com");
}
open (OUTFILE,"|".&sqlplus." > /dev/null");
print OUTFILE "update version_number set version_number=$version;\n";
@@ -712,4 +712,4 @@ sub getQuerySeq
system("rm -f /tmp/seq.$::opt_username.$::opt_service.$time.tmp");
return $line;
}
}