Модераторы: dimbor, Модераторы разделов
Код: Выделить всё
SELECT
count(key), /* если ключа нет будет 0 */
key,
coalesce(us.value,rs.value) as value /* если у юзверя установлен параметр то он не NULL */
FROM settings as rs
LEFT JOIN settings as us on us.key=rs.key AND us.user=@user
WHERE rs.user='root'
GROUP BY rs.key /* обязательно, если запрос не по одному ключу в WHERE, а если по одному то и не важно */
Да хоть матом на заборе. Тоже проще в итоге. Это все переписывание преследует в первую очередь цель разобраться, как оно функционирует в целом. И всплывают нюансики, знаешь ли.
Точно так: https://www.sqlite.org/lang_attach.html Два сопроцесса не требуются.
Поживем - увидим. Пока старые source *.conf явно быстрее летают, чем манипуляции с БД. Одна надежда предвычислить и прочекать заранее все, до чего дотянусь. Предупреждаю, может получиться: "Думала - счастье!... А нет, опять опыт."
Код: Выделить всё
GolangNX v.0.0.1
Usage: nx2go file.nxs
10:44:12.484325 client: Load config file: /home/addm/.nx/config/192.168.0.50.nxs
10:44:12.485917 client: Config Application 'nxclient' Version '1.3'
10:44:12.485942 client: Found 9 config Groups
10:44:12.486200 client: Check LookPath for /usr/NX/bin/nxssh
10:44:12.486234 client: set environment variable NX_SYSTEM to /usr/NX
10:44:12.486243 client: set environment variable NX_ROOT to /home/addm/.nx
10:44:12.486250 client: set environment variable NX_HOME to /home/addm
10:44:12.486256 client: set environment variable NX_CONFIG to /home/addm/.nx/config/192.168.0.50.nxs
10:44:12.486263 client: set environment variable NX_NXCLIENT to /usr/bin/nxagent
10:44:12.486269 client: set environment variable XAUTHORITY to /home/addm/.Xauthority
10:44:12.486275 client: set environment variable NX_TEMP to
10:44:12.486281 client: set environment variable HOME to /home/addm
10:44:12.486288 client: set environment variable LD_LIBRARY_PATH to /usr/NX/lib
10:44:12.486298 client: set environment variable NX_VERSION to 3.5.0
10:44:12.486384 client: Starting nxssh: /usr/NX/bin/nxssh -nx -v -x -2 -4 -p 22 -B -E -i /home/addm/.nx/temp/keylog -o StrictHostKeyChecking=no nx@192.168.0.50
10:44:12.488718 client: Started nxssh with pid 24665
10:44:12.488759 client: mkdir /home/addm/.nx/24665
10:44:12.488965 client: set environment variable NX_TEMP to /home/addm/.nx/24665
10:44:12.488995 client: Waiting nxssh for exit
10:44:13.036961 nxssh: (StdIn) NX> 208 Using auth method: publickey
10:44:13.572053 nxssh: (StdIn) HELLO NXSERVER - Version 3.5.0-0.2-CE OS (GPL, using backend: 3.5.99.23)
10:44:13.572154 nxssh: (StdOut) Send: HELLO NXCLIENT - Version 3.5.0
10:44:13.619889 nxssh: (StdIn) NX> 105 HELLO NXCLIENT - Version 3.5.0
10:44:13.620016 nxssh: (StdIn) NX> 134 Accepted protocol: 3.5.0
10:44:13.620043 nxssh: (StdOut) Send username: addm
10:44:13.762372 nxssh: (StdIn) NX> 105 SET SHELL_MODE SHELL
10:44:13.763028 nxssh: (StdIn) NX> 105 SET AUTH_MODE PASSWORD
10:44:13.763049 nxssh: (StdIn) NX> 105 login
10:44:13.763769 nxssh: (StdIn) NX> 101 User: addm
10:44:13.763790 nxssh: (StdOut) Send password: ***
10:44:13.896124 nxssh: (StdIn) NX> 102 Password:
10:44:14.385158 nxssh: (StdIn) NX> 103 Welcome to: server2 user: addm
10:44:14.385321 nxssh: (StdOut) listsession: addm
10:44:14.438986 nxssh: (StdIn) NX> 105 listsession --user="addm" --status="suspended,running" --type="unix-application"
10:44:14.525135 nxssh: (StdIn) NX> 127 Sessions list of user 'addm' for reconnect:
10:44:14.525180 nxssh: (StdIn) Display Type Session ID Options Depth Screen Status Session Name
10:44:14.525191 nxssh: (StdIn) ------- ---------------- -------------------------------- -------- ----- -------------- ----------- ------------------------------
10:44:14.525199 nxssh: (StdIn) 2000 unix-application 3815C6AFDC559FD983082B7429B2300B --D--PSA 32 1920x1080 server2
10:44:14.525208 nxssh: (StdIn) NX> 148 Server capacity: not reached for user: addm
10:44:14.666486 nxssh: (StdIn) NX> 105 startsession --virtualdesktop="1" --rootless="0" --application="startxfce4" --link="adsl" --screeninfo="1920x1080x32+render" --encryption="1" --samba="0" --cups="0" --media="0" --session="server2" --type="unix-application" --client="linux" --keyboard="pc105/us"
10:44:15.236373 nxssh: (StdIn) NX> 1000 NXNODE - Version 3.5.0-0.2-CE OS (GPL, using backend: 3.5.99.23)
10:44:15.326985 nxssh: (StdIn) NX> 1009 Session status: starting
10:44:15.428603 nxssh: (StdIn) NX> 700 Session id: server2-2002-F6CB638FAD517DCF35279067B9A4AFF4
10:44:15.431240 nxssh: (StdIn) NX> 705 Session display: 2002
10:44:15.433273 nxssh: (StdIn) NX> 703 Session type: unix-application
10:44:15.436060 nxssh: (StdIn) NX> 701 Proxy cookie: 6a3049b590ee55aa4cdbf9f1fa8cf6ae
10:44:15.447565 nxssh: (StdIn) NX> 702 Proxy IP: 192.168.0.50
10:44:15.489489 nxssh: (StdIn) NX> 706 Agent cookie: 6a3049b590ee55aa4cdbf9f1fa8cf6ae
10:44:15.489656 nxssh: (StdIn) NX> 704 Session cache: unix-application
10:44:15.489683 nxssh: (StdIn) NX> 707 SSL tunneling: 1
10:44:15.865423 nxssh: (StdIn) NX> 710 Session status: running
10:44:15.872808 nxssh: (StdIn) NX> 1002 Commit
10:44:15.872896 client: mkdir /home/addm/.nx/S-server2-2002-F6CB638FAD517DCF35279067B9A4AFF4
10:44:15.873030 client: options: nx/nx,cookie=6a3049b590ee55aa4cdbf9f1fa8cf6ae,shmem=1,shpix=1,font=1,encryption=1,session=session,id=server2-2002-F6CB638FAD517DCF35279067B9A4AFF4:2002
10:44:15.873035 client: options saved to: /home/addm/.nx/S-server2-2002-F6CB638FAD517DCF35279067B9A4AFF4/options
10:44:15.873042 nxssh: (StdOut) Send: bye
10:44:15.948841 nxssh: (StdIn) NX> 105 bye
10:44:15.949910 nxssh: (StdErr) NX> 105 bye
10:44:15.949939 nxssh: (StdOut) Send: NX> 299 Switch connection to: NX mode: encrypted options: nx,options=/home/addm/.nx/S-server2-2002-F6CB638FAD517DCF35279067B9A4AFF4/options:2002
10:44:15.955280 nxssh: (StdErr) NX> 105 bye
Код: Выделить всё
GolangNX v.0.0.1
Usage: nx2go file.nxs
15:42:53.110336 client: Load config file: /home/addm/.nx/config/localhost.nxs
15:42:53.111896 client: Config Application 'nxclient' Version '1.3'
15:42:53.111919 client: Found 9 config Groups
15:42:53.112247 client: Check LookPath for /usr/NX/bin/nxssh
15:42:53.112279 client: set environment variable NX_SYSTEM to /usr/NX
15:42:53.112288 client: set environment variable NX_ROOT to /home/addm/.nx
15:42:53.112295 client: set environment variable NX_HOME to /home/addm
15:42:53.112302 client: set environment variable NX_CONFIG to /home/addm/.nx/config/localhost.nxs
15:42:53.112308 client: set environment variable NX_NXCLIENT to /usr/bin/nxagent
15:42:53.112315 client: set environment variable XAUTHORITY to /home/addm/.Xauthority
15:42:53.112321 client: set environment variable NX_TEMP to
15:42:53.112327 client: set environment variable HOME to /home/addm
15:42:53.112344 client: set environment variable LD_LIBRARY_PATH to /usr/NX/lib
15:42:53.112351 client: set environment variable NX_VERSION to 3.5.0
15:42:53.112441 client: Starting nxssh: /usr/NX/bin/nxssh -nx -v -x -2 -4 -p 22 -B -E -i /home/addm/.nx/temp/keylog -o StrictHostKeyChecking=no nx@localhost
15:42:53.113175 client: Started nxssh with pid 30467
15:42:53.113216 client: mkdir /home/addm/.nx/30467
15:42:53.113310 client: set environment variable NX_TEMP to /home/addm/.nx/30467
15:42:53.113338 client: Waiting nxssh for exit
15:42:53.165258 nxssh: (StdIn) NX> 208 Using auth method: publickey
15:42:53.697823 nxssh: (StdIn) HELLO NXSERVER - Version 3.5.0-0.2-CE OS (GPL, using backend: 3.5.99.22)
15:42:53.697908 nxssh: (StdOut) Send: HELLO NXCLIENT - Version 3.5.0
15:42:53.699418 nxssh: (StdIn) NX> 105 HELLO NXCLIENT - Version 3.5.0
15:42:53.702378 nxssh: (StdIn) NX> 134 Accepted protocol: 3.5.0
15:42:53.702439 nxssh: (StdOut) Send username: addm
15:42:53.702689 nxssh: (StdIn) NX> 105 SET SHELL_MODE SHELL
15:42:53.702909 nxssh: (StdIn) NX> 105 SET AUTH_MODE PASSWORD
15:42:53.703097 nxssh: (StdIn) NX> 105 login
15:42:53.703308 nxssh: (StdIn) NX> 101 User: addm
15:42:53.703327 nxssh: (StdOut) Send password: ***
15:42:53.703628 nxssh: (StdIn) NX> 102 Password:
15:42:54.288464 nxssh: (StdIn) NX> 103 Welcome to: addm-VirtualBox user: addm
15:42:54.288508 nxssh: (StdOut) listsession: addm
15:42:54.301169 nxssh: (StdIn) NX> 105 listsession --user="addm" --status="suspended,running" --type="unix-application"
15:42:54.354735 nxssh: (StdIn) NX> 127 Sessions list of user 'addm' for reconnect:
15:42:54.354858 nxssh: (StdIn) Display Type Session ID Options Depth Screen Status Session Name
15:42:54.354878 nxssh: (StdIn) ------- ---------------- -------------------------------- -------- ----- -------------- ----------- ------------------------------
15:42:54.354892 nxssh: (StdIn) NX> 148 Server capacity: not reached for user: addm
15:42:54.361189 nxssh: (StdIn) NX> 105 startsession --virtualdesktop="1" --rootless="0" --application="startxfce4" --link="adsl" --screeninfo="1920x1080x32+render" --encryption="1" --samba="0" --cups="0" --media="0" --session="server2" --type="unix-application" --client="linux" --keyboard="pc105/us"
15:42:55.083595 nxssh: (StdIn) NX> 1000 NXNODE - Version 3.5.0-0.2-CE OS (GPL, using backend: 3.5.99.22)
15:42:55.490558 nxssh: (StdIn) NX> 1009 Session status: starting
15:42:55.575231 nxssh: (StdIn) NX> 700 Session id: addm-VirtualBox-2001-0416188D4F9C681467A46F53CFD28413
15:42:55.575295 nxssh: (StdIn) NX> 705 Session display: 2001
15:42:55.576293 nxssh: (StdIn) NX> 703 Session type: unix-application
15:42:55.577331 nxssh: (StdIn) NX> 701 Proxy cookie: 65e895c2944ce6061aee70878df32843
15:42:55.578346 nxssh: (StdIn) NX> 702 Proxy IP: 127.0.1.1
15:42:55.579650 nxssh: (StdIn) NX> 706 Agent cookie: 65e895c2944ce6061aee70878df32843
15:42:55.580853 nxssh: (StdIn) NX> 704 Session cache: unix-application
15:42:55.582046 nxssh: (StdIn) NX> 707 SSL tunneling: 1
15:42:55.994119 nxssh: (StdIn) NX> 710 Session status: running
15:42:55.994866 nxssh: (StdIn) NX> 1002 Commit
15:42:55.994916 client: mkdir /home/addm/.nx/S-addm-VirtualBox-2001-0416188D4F9C681467A46F53CFD28413
15:42:55.995047 client: options: nx/nx,cookie=65e895c2944ce6061aee70878df32843,shmem=1,shpix=1,font=1,encryption=1,session=session,id=addm-VirtualBox-2001-0416188D4F9C681467A46F53CFD28413:2001
15:42:55.995053 client: options saved to: /home/addm/.nx/S-addm-VirtualBox-2001-0416188D4F9C681467A46F53CFD28413/options
15:42:55.995057 nxssh: (StdOut) Send: bye
15:42:55.996955 nxssh: (StdErr) NX> 1002 Commit
15:42:55.996993 nxssh: (StdErr) NX> 1002 Commit
15:42:55.997006 nxssh: (StdIn) NX> 105 bye
15:42:56.029602 nxssh: (StdErr) NX> 105 bye
15:42:56.029643 nxssh: (StdOut) Send: NX> 299 Switch connection to: NX mode: encrypted options: nx,options=/home/addm/.nx/S-addm-VirtualBox-2001-0416188D4F9C681467A46F53CFD28413/options:2001
Код: Выделить всё
elif stringinstring "Info: Waiting for connection from" "$line"; then
# Session is running
# dimbor: with nx-libs 3.5.99 node_monitor catch of startsession
# restore too fast
sleep 0.5s
echo "NX> 710 Session status: running"
echo "NX> 1002 Commit"
echo "NX> 1006 Session status: running"
Код: Выделить всё
echo $'NX> 710 Session status: running\nNX> 1002 Commit\nNX> 1006 Session status: running'
Когда агент готов ко внешнему подключению, он шлет это сообщение в stdout (и заодно в session log). Возможно преждевременно. Раньше (не)ловилось в node_start_agent() и все вставало раком там, если слишком быстро переслать готовность клиенту.Djelf писал: ↑01.02.2020 18:52Хм, а вот тут, в nxnode, 0.5с действительно нужно? При отключении не работает, но даже 0.01с хватает, возможно не всегда.
Как так при 0 не работает, а 0.01с хватает?
Тут никак нельзя исхитриться поймать другим способом?
Что там вообще на сервере происходит между NX 707 и NX 710?
Done.
Джейсона посмотрю позже, зопейсал.Djelf писал: ↑01.02.2020 18:52P.S. Альфа консольного клиента на Golang под Linux с этой детализацией: https://cloud.mail.ru/public/23Xv/2JeEcrEqH
Еще быстрее, чем это, сделать клиента можно только поменяв протокол на, например json, и фигачить через него сразу весь информативный блок.
Для работы с этим , использую https://code.visualstudio.com, может тебе и с bash оно "попрет".
В гитхабовскую вику или ридми? И что добавить, ссылку на дискуссию? Что понял, там в оконцовке либа чудодейственная получилась. А перетолмачивать буржуинскую мову нерезидентов о нещупанных своими руками вещах - опасаюсь.
Код: Выделить всё
#!/bin/sh
mkdir nxclient
cd nxclient
wget http://debian.rot13.org/binary/64.34.161.181/download/3.5.0/Linux/nxclient_3.5.0-7_amd64.deb
#wget http://debian.rot13.org/binary/64.34.161.181/download/3.5.0/Linux/nxclient_3.5.0-7_i386.deb
wget https://github.com/dimbor-ru/freenx-server/files/4128228/nxfixglibc1190.tar.gz
dpkg -i ./nxclient_3.5.0-7_amd64.deb
find /usr/NX/lib -name "libz*" -delete
tar -xvf nxfixglibc1190.tar.gz
#cp ./nxfixglibc1190/x32/nxfixglibc1190.so /usr/NX/lib/nxfixglibc1190.so
cp ./nxfixglibc1190/x64/nxfixglibc1190.so /usr/NX/lib/nxfixglibc1190.so
cp /usr/NX/bin/nxclient /usr/NX/bin/nxclient.bin
echo '#!/bin/sh' > /usr/NX/bin/nxclient
echo 'LD_PRELOAD=/usr/NX/lib/nxfixglibc1190.so /usr/NX/bin/nxclient.bin /$@' >> /usr/NX/bin/nxclient
Код: Выделить всё
#!/bin/sh
find /usr/NX/lib -name "libjpeg*" -delete
find /usr/NX/lib -name "libXcomp*" -delete
ln -s /usr/lib/x86_64-linux-gnu/libjpeg.so /usr/NX/lib/libjpeg.so.62
ln -s /usr/lib/x86_64-linux-gnu/libXcomp.so.3 /usr/NX/lib/libXcomp.so
И по поводу чекинга запуска библиотек.if (m_pEvtHandler) {
// If no LF received within a second, send buffer anyway
+ if (!m_sOutBuf.IsEmpty()) {
- //if ((m_sSpecial.Len() && m_sOutBuf.StartsWith(m_sSpecial)) || ((m_cOutWatch.Time() > 100) && (!m_sOutBuf.IsEmpty()))) {
Код: Выделить всё
18:16:40.920353 nxssh: (StdIn) NX> 1000 NXNODE - Version 3.5.0-0.2-CE OS (GPL, using backend: 3.5.99.22)
18:16:41.025116 nxssh: (StdIn) NX> 1009 Session status: starting
18:16:41.113416 nxssh: (StdIn) NX> 700 Session id: addm-VirtualBox-2002-29B735D94D37B00E9EC00E2CBED99DE2
18:16:41.114872 nxssh: (StdIn) NX> 705 Session display: 2002
18:16:41.114893 nxssh: (StdIn) NX> 703 Session type: unix-application
18:16:41.116331 nxssh: (StdIn) NX> 701 Proxy cookie: 71ee0caf48f947a8f00d69145fbcfe4f
18:16:41.116716 nxssh: (StdIn) NX> 702 Proxy IP: 127.0.1.1
18:16:41.117606 nxssh: (StdIn) NX> 706 Agent cookie: 71ee0caf48f947a8f00d69145fbcfe4f
18:16:41.119664 nxssh: (StdIn) NX> 704 Session cache: unix-application
18:16:41.119694 nxssh: (StdIn) NX> 707 SSL tunneling: 1
18:16:41.124141 nxssh: (StdIn) NX> 710 Session status: running
18:16:41.124765 nxssh: (StdIn) NX> 1002 Commit
Код: Выделить всё
17:53:44.510823 nxssh: (StdIn) NX> 1000 NXNODE - Version 3.5.0-0.2-CE OS (GPL, using backend: 3.5.99.22)
17:53:44.616774 nxssh: (StdIn) NX> 1009 Session status: starting
17:53:44.619566 nxssh: (StdIn) NX> 710 Session status: running
17:53:44.621380 nxssh: (StdIn) NX> 1002 Commit
Код: Выделить всё
--- a/AsyncProcess.cpp
+++ b/AsyncProcess.cpp
@@ -145,8 +145,11 @@ AsyncProcess::Entry()
}
if (m_pEvtHandler) {
// If no LF received within a second, send buffer anyway
- if ((m_sSpecial.Len() && m_sOutBuf.StartsWith(m_sSpecial)) ||
- ((m_cOutWatch.Time() > 100) && (!m_sOutBuf.IsEmpty()))) {
+ //if ((m_sSpecial.Len() && m_sOutBuf.StartsWith(m_sSpecial)) || ((m_cOutWatch.Time() > 100) && (!m_sOutBuf.IsEmpty()))) {
+ //
+ //+Djelf: there is no need to wait, all data should already be in the buffer,
+ // with the exception of a long list of sessions, more than a TCP/IP packet
+ if (!m_sOutBuf.IsEmpty()) {
myLogTrace(MYTRACETAG, wxT("IoThread outwatch timed out"));
wxCommandEvent event(wxEVT_PROCESS_STDOUT, wxID_ANY);
event.SetString(m_sOutBuf);
@@ -180,8 +183,12 @@ AsyncProcess::Entry()
}
if (m_pEvtHandler) {
// If no LF received within a second, send buffer anyway
- if ((m_sSpecial.Len() && m_sErrBuf.StartsWith(m_sSpecial)) ||
- ((m_cErrWatch.Time() > 100) && (!m_sErrBuf.IsEmpty()))) {
+ //if ((m_sSpecial.Len() && m_sErrBuf.StartsWith(m_sSpecial)) ||
+ // ((m_cErrWatch.Time() > 100) && (!m_sErrBuf.IsEmpty()))) {
+ //
+ //+Djelf: there is no need to wait, all data should already be in the buffer,
+ // with the exception of a long list of sessions, more than a TCP/IP packet
+ if (!m_sErrBuf.IsEmpty()) {
myLogTrace(MYTRACETAG, wxT("IoThread errwatch timed out"));
wxCommandEvent event(wxEVT_PROCESS_STDERR, wxID_ANY);
event.SetString(m_sErrBuf);
Код: Выделить всё
--- a/MySession.cpp
+++ b/MySession.cpp
@@ -837,7 +837,7 @@ MySession::OnSshEvent(wxCommandEvent &event)
::wxRemoveFile(fn.GetFullPath());
}
m_pDlg->SetStatusText(_("Sending username"));
- printSsh(m_pCfg->sGetSessionUser());
+ //printSsh(m_pCfg->sGetSessionUser());
break;
case MyIPC::ActionSendPassword:
m_pDlg->SetStatusText(_("Authenticating"));
@@ -877,16 +877,25 @@ MySession::OnSshEvent(wxCommandEvent &event)
m_eConnectState = STATE_SHELLMODE;
break;
case STATE_SHELLMODE:
- printSsh(wxT("SET SHELL_MODE SHELL"));
+ scmd = wxT("SET SHELL_MODE SHELL\n");
+ scmd << wxT("SET AUTH_MODE PASSWORD\n");
+ scmd << wxT("login\n");
+ scmd << m_pCfg->sGetSessionUser();
+ printSsh(scmd);
+ m_eConnectState = STATE_LOGIN;
+ break;
+ /*
+ printSsh(wxT("SET SHELL_MODE SHELL");
m_eConnectState = STATE_AUTHMODE;
break;
case STATE_AUTHMODE:
printSsh(wxT("SET AUTH_MODE PASSWORD"));
m_eConnectState = STATE_LOGIN;
break;
case STATE_LOGIN:
printSsh(wxT("login"));
break;
+ */
case STATE_LIST_RESOURCES:
m_pDlg->SetStatusText(_("Query server-side features"));
printSsh(wxT("resourcelist"));
Ты только старые строки в коде не стирай. И добавь туда что типа:
Код: Выделить всё
Do not delete it!
Sending multiple messages at the same time does not correspond to the exchange protocol, but these messages are always sent in that order.
FreeNX understands and correctly processes this.
This does not give much startup acceleration, but still gives.Код: Выделить всё
--- a/nxserver
+++ b/nxserver
@@ -378,7 +378,6 @@ _session_list_user_suspended() {
session_list_user_suspended() {
local SESSION_LIST_CACHE_DATA=$(_session_list_user_suspended "$@")
- echo "$SESSION_LIST_CACHE_DATA"
echo "$SESSION_LIST_CACHE_DATA" | log_tee
}
Задваивание ушло. 2.05с Лог: