Commit graph

264 commits

Author SHA1 Message Date
Fabio Bas
22af789c9e Servatrice: log to console authentication method on startup 2014-10-07 17:04:22 +02:00
Fabio Bas
15555c16fd Fix servatrice's regonly mode 2014-10-06 22:56:09 +02:00
Fabio Bas
01bd26d228 Misc typos fixing 2014-10-06 21:44:20 +02:00
Fabio Bas
0d9eec4b64 Servatrice: added authentication type "password" 2014-10-04 17:50:01 +02:00
Fabio Bas
0261862b1b Fix configuration loading 2014-10-04 10:33:55 +02:00
Fabio Bas
871f5f7c94 use qWarning instead of std::err 2014-10-02 23:45:42 +02:00
Fabio Bas
8d8ccaad7f use 4 spaces instead of tabs 2014-10-02 23:42:51 +02:00
Fabio Bas
37eaeaae13 servatrice: as a third choice, check for a config in /etc/servatrice/ 2014-10-02 23:41:24 +02:00
Fabio Bas
b348068369 Servatrice: Add a default option for every config value
add an empty room swell, if none had been defined in the config (or we
are running with no config at all)
2014-10-02 23:11:49 +02:00
Fabio Bas
4b38187d20 Fix logfile option in servatrice.ini
servatrice was using hardcocded filename “server.log” even if a custom
value was specified
2014-10-02 23:00:17 +02:00
Fabio Bas
a1b6600fe1 Servatrice: group all the use of QSettings in a single file
and add a method to guess the path of servatrice.ini
2014-10-02 22:37:50 +02:00
Fabio Bas
355de8fba4 Drop libgcrypt dependency for qt5 2014-10-01 20:21:22 +02:00
Gavin Bisesi
5c46cfc169 Merge pull request #179 from woogerboy21/registered-user-only-server
Registered Only Server
2014-08-11 09:03:57 -04:00
Fabio Bas
6e3c7d33da Make protobuf cleanup its resourced when servatrice ends
Should help make valgrind’s log a bit cleaner
2014-08-08 13:43:50 +02:00
Fabio Bas
0a5106b8ef Don't leak a QSettings object at every logged message 2014-08-08 09:57:07 +02:00
Fabio Bas
13bd35e020 Servatrice: add prototypes for local functions 2014-07-24 18:16:08 +02:00
Fabio Bas
036980eb44 ISO C++ forbids variable length array 2014-07-24 17:37:54 +02:00
woogerboy21
021f0911c4 Merge remote-tracking branch 'upstream/master' into registered-user-only-server
Conflicts:
	common/server.cpp
	common/server_protocolhandler.cpp
	servatrice/src/servatrice.cpp
2014-07-18 23:46:56 -04:00
Fabio Bas
d894c53265 Servatrice: fix handling of incoming connections on qt5 2014-07-08 22:05:06 +02:00
woogerboy21
0a1fe7f5a8 Requested Cleanup
Corrected tab to 4 space (per request)
Moved regonly option under authentication ini location (per request)
2014-07-02 22:27:05 -04:00
woogerboy21
d246fa39fe Registered Only Server
Implemented the ability to set the server to only allow registered
users.  Also updated client to reflect the log-in rejection as well as
put a check in place for the server to not start if db connection is not
available yet registration is required.
2014-07-02 20:52:22 -04:00
Daenyth
09d6d26fb2 Merge branch 'master' into cmake_qt5
Conflicts:
	cockatrice/src/main.cpp
2014-06-28 09:13:10 -04:00
woogerboy21
f685bd2abe formatting
4 space indent + code flow rewrite for easier readability.
2014-06-27 18:18:03 -04:00
woogerboy21
b83fe95b05 removed extra un-needed empty line.
removed extra un-needed empty line.
2014-06-26 14:46:22 -04:00
woogerboy21
365de1fdd0 added multiple filter capabilities
changed the single qstring log filtering to qstringlist to allow multiple filtering capabilities
2014-06-26 14:38:57 -04:00
woogerboy21
91a96643f0 updated filtering code
rewrote filtering code to allow for user input
code only filters on single string at the moment (still needs updated).
2014-06-26 00:38:43 -04:00
Fabio Bas
bab340f7b7 Reworked a bit message handling from previous commit 2014-06-24 18:52:04 +02:00
Fabio Bas
2953c6ba2a Ported servatrice 2014-06-24 18:42:46 +02:00
woogerboy21
ec00bdebed verbose incrementation
removed un-used variables
changed switch case to increase verbose level as loglevel increases
captured unset loglevel to default to highest verbose log level
2014-06-23 09:18:49 -04:00
woogerboy21
46ceeadbbd updated code structure
cleaned code structure up for clarity
2014-06-23 03:41:46 -04:00
woogerboy21
5592346979 added server log filtering
added log filtering based on configuration file setting
0 = log everything
1 = log nothing
2 = chat logging only
2014-06-23 00:07:12 -04:00
Mark Morschhäuser
05f46011eb Fix toLatin1() changes from 6fa94dd to toUtf8(). 2014-06-20 18:16:46 +02:00
Mark Morschhäuser
6fa94dd475 Qt5: toAscii() and fromAscii() Methods are deprecated 2014-06-20 16:55:26 +02:00
Daenyth
347d30a84b Merge branch 'master' of git://github.com/mbruker/Cockatrice 2013-02-27 12:36:14 -05:00
Max-Wilhelm Bruker
ce642e3000 don't use Server_Room::getInfo when updating 2013-02-15 19:31:37 +01:00
Max-Wilhelm Bruker
7a30b827c8 changed Server_Room::gamesMutex to QReadWriteLock 2013-02-11 15:43:31 +01:00
Max-Wilhelm Bruker
b2dbfeb7f3 added thread names (2) 2013-01-27 16:42:53 +01:00
Max-Wilhelm Bruker
ae01144547 added thread names 2013-01-27 16:40:30 +01:00
Max-Wilhelm Bruker
c65f327e71 server crash fixes 2013-01-27 15:15:27 +01:00
Max-Wilhelm Bruker
4f97db62d7 server deadlock fix #2 2013-01-26 17:03:31 +01:00
Max-Wilhelm Bruker
8d596619e7 server deadlock fix 2013-01-26 16:34:24 +01:00
Max-Wilhelm Bruker
d5ccda49a1 server code cleanup 2013-01-23 11:51:59 +01:00
Max-Wilhelm Bruker
2deabebc7c added PasswordHasher::initialize() to make libgcrypt warnings go away 2013-01-12 18:05:08 +01:00
Max-Wilhelm Bruker
915e809eb5 changed user -> id_user in decklist_folders and decklist_files (issue #48) 2013-01-10 00:01:06 +01:00
Max-Wilhelm Bruker
2e06b95e5c deadlock fix 2013-01-09 22:28:49 +01:00
Max-Wilhelm Bruker
43d7cf6a1a removed recursive lock in server; moved object serialisation to worker thread 2012-10-14 13:19:03 +02:00
Daenyth
af09d0d294 Reject more invalid usernames from clients.
Specifically this should cover people connecting with a username of
"\u200C"
2012-07-25 00:12:35 -04:00
Max-Wilhelm Bruker
a1e35ccda5 servatrice: create correct game ids when not using a database 2012-07-17 18:47:00 +02:00
Max-Wilhelm Bruker
c8852b450d don't open database in connection pools if main database connection is not valid 2012-07-17 18:15:10 +02:00
Max-Wilhelm Bruker
e326f9613a added numberPools=0 option to make server unthreaded 2012-06-24 23:49:10 +02:00