Changeset a168f52 in tol for tolsh/tolsh.vfs/lib/tolcomm

Timestamp:

Dec 6, 2010, 9:22:59 PM (16 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

4e49e21

Parents:

10a207c

Message:

refs #1028, tequila server is started on the first available port starting from port number 20458.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2747 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tolsh/tolsh.vfs/lib/tolcomm

Files:

• tolserver.tcl (modified) (4 diffs)
• tolshared.tcl (modified) (2 diffs)

tolsh/tolsh.vfs/lib/tolcomm/tolserver.tcl

@@ -452 +452 @@
   array set options {
     -port 6669
+    -shport 20458
     -logfile ""
     -compile ""
@@ -467 +468 @@
   }
   
-  server_attach_data
+  server_attach_data $options(-shport)
 
   log "debug" "shared_tasks(init)=$options(-compile)"
@@ -474 +475 @@
 }
 
-proc ::tolserver::server_attach_data {} {
+proc ::tolserver::server_attach_data { shared_port } {
   package require tequila
   global shared_tasks
@@ -480 +481 @@
   global shared_finish
 
-  tequila::open localhost 20458
+  tequila::open localhost $shared_port
   tequila::attach shared_tasks
   tequila::attach shared_state

tolsh/tolsh.vfs/lib/tolcomm/tolshared.tcl

@@ -22 +22 @@
 #
 ###############################################################################
-proc ::tolshared::start {} {
+proc ::tolshared::start { port datadir } {
   global tqs_info
   package require Mk4tcl
@@ -28 +28 @@
 
   puts "::tolshared::start"
-  mk::file open tqs tequilas.dat -nocommit
+  # OJO: este archivo hay abrirlo en algun directorio controlado
+  mk::file open tqs [ file join $datadir tequilas.${port}.dat ] -nocommit
   set tqs_info(verbose) 0     ;# default logging is off
   TqsTimer ""                 ;# default commit timer is 30 seconds
-  tqsRun 20458                ;# default port is 20458
+  tqsRun $port                ;# default port is 20458
 }