pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup Python 3 server startup code. Fixes #3277

pull/17/head
Akshay Joshi 2018-05-31 10:07:08 -04:00 committed by Dave Page
parent bc63b278be
commit 5f0799714d
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/Server.cpp
View File

@ -321,9 +321,7 @@ void Server::run()
wchar_t* n_argv[] = { wcAppName }; wchar_t* n_argv[] = { wcAppName };
PySys_SetArgv(1, n_argv); PySys_SetArgv(1, n_argv);
int fd = fileno(cp); if (PyRun_SimpleFile(cp, m_appfile_utf8.data()) != 0)
PyObject* PyFileObject = PyFile_FromFd(fd, m_appfile_utf8.data(), (char *)"r", -1, NULL, NULL,NULL,1);
if (PyRun_SimpleFile(fdopen(PyObject_AsFileDescriptor(PyFileObject),"r"), m_appfile_utf8.data()) != 0)
setError(tr("Failed to launch the application server, server thread exiting.")); setError(tr("Failed to launch the application server, server thread exiting."));
#endif #endif