mirror of
https://github.com/worldforge/cyphesis
synced 2026-08-13 12:26:04 -04:00
a884fa4866
* common/Database.cpp, common/newid.cpp, server/server.cpp: Modify new ID checks so that code still runs when database is unavailable, and events requiring new IDs fail cleanly. * server/Connection.cpp: Report a failure to create a player account if no ID available. * rulesets/BaseMind.cpp: When processing appearance ops, handle stamp more efficiently, report an error if ID is missing from argument. * server/IdlePSQLConnector.cpp, server/IdlePSQLConnector.h: Implement re-connecting to the Database if connection is lost. * rulesets/Character.cpp, rulesets/Entity.cpp, rulesets/Thing.cpp: Ensure STAMP is present on appearance op args. * server/CommListener.cpp, server/CommListener.h, server/CommPeerListener.cpp, server/CommPeerListener.h, server/CommSlaveListener.cpp, server/CommSlaveListener.h, server/CommUnixListener.cpp, server/CommUnixListener.h: Add a return value to method for creating new client socket objects, and use it to return failure if no ID is available from the database for a new object. * rulesets/Py_Point3D.cpp, rulesets/Py_Vector3D.cpp, rulesets/Python_API.cpp: Add "new" method for class wrappers, and call the in place constructor from new rather than init. Re-write internal function for creating new instances so it uses the "new" method. * rulesets/Py_Statistics.cpp: Remove some obsolete code inadvertedly copied from another file. Comment out some unused code to get rid of a warning. * server/CommPSQLSocket.cpp: Clear the database connection from destructor. * tests/python_class.cpp: A new test for experimenting with new Python wrappers.
52 lines
1.7 KiB
C++
52 lines
1.7 KiB
C++
// Cyphesis Online RPG Server and AI Engine
|
|
// Copyright (C) 2006 Alistair Riddoch
|
|
//
|
|
// This program is free software; you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation; either version 2 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this program; if not, write to the Free Software Foundation,
|
|
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
#include "IdlePSQLConnector.h"
|
|
|
|
#include "CommServer.h"
|
|
#include "CommPSQLSocket.h"
|
|
|
|
#include "common/Database.h"
|
|
#include "common/log.h"
|
|
|
|
#include <iostream>
|
|
|
|
/// \brief Constructor for PSQL Connector.
|
|
///
|
|
/// @param svr Reference to the object that manages all socket communication.
|
|
IdlePSQLConnector::IdlePSQLConnector(CommServer & svr, Database & db) :
|
|
Idle(svr), m_db(db), m_lastConnect(svr.time())
|
|
{
|
|
}
|
|
|
|
IdlePSQLConnector::~IdlePSQLConnector()
|
|
{
|
|
}
|
|
|
|
void IdlePSQLConnector::idle(time_t time)
|
|
{
|
|
if (time > m_lastConnect) {
|
|
m_lastConnect = time;
|
|
if (m_db.initConnection() == 0) {
|
|
log(NOTICE, "Database connection re-established");
|
|
CommPSQLSocket * dbsocket = new CommPSQLSocket(m_idleManager, m_db);
|
|
m_idleManager.addSocket(dbsocket);
|
|
m_idleManager.addIdle(dbsocket);
|
|
delete this;
|
|
}
|
|
}
|
|
}
|