6482f17 · opencog-cogserver

Changed files (4) +48 -8

opencog/cogserver/atoms/CogServerNode.cc +15 -0

…	…	@@ -156,6 +156,21 @@ bool CogServerNode::usesMessage(const Handle& key) const
156	156	return false;
157	157	}
158	158
	159	ValuePtr CogServerNode::getValue(const Handle& key) const
	160	{
	161	// Handle the -is-running?- query
	162	if (PREDICATE_NODE == key->get_type())
	163	{
	164	static constexpr uint32_t p_is_running = dispatch_hash("-is-running?-");
	165	const std::string& pred = key->get_name();
	166	if (dispatch_hash(pred.c_str()) == p_is_running)
	167	return createBoolValue(CogServer::running());
	168	}
	169
	170	// Pass through to base class for all other keys
	171	return Atom::getValue(key);
	172	}
	173
159	174	void CogServerNode::setValue(const Handle& key, const ValuePtr& value)
160	175	{
161	176	// If not a PredicateNode, just store the value.

opencog/cogserver/atoms/CogServerNode.h +1 -0

…	…	@@ -50,6 +50,7 @@ public:
50	50	CogServerNode& operator=(const CogServerNode&) = delete;
51	51
52	52	virtual void setValue(const Handle&, const ValuePtr&);
	53	virtual ValuePtr getValue(const Handle&) const;
53	54	virtual void setAtomSpace(AtomSpace*) override;
54	55	virtual HandleSeq getMessages() const;
55	56	virtual bool usesMessage(const Handle&) const;

opencog/cogserver/server/CogServer.h +1 -1

…	…	@@ -109,7 +109,7 @@ public:
109	109
110	110	void set_max_open_sockets(int);
111	111
112		bool running(void) { return _running; }
	112	bool running(void) const { return _running; }
113	113
114	114	/** Get the web server port */
115	115	short getWebServerPort() const { return _webServer ? _webServer->getPort() : 0; }

tests/scm/cog-server-test.scm +31 -7

…	…	@@ -88,15 +88,34 @@
88	88	(define (stop-named-cogserver csn)
89	89	(cog-set-value! csn (Predicate "-stop-") (VoidValue)))
90	90
	91	;; Helper to check if a cogserver is running
	92	(define (cogserver-running? csn)
	93	(define val (cog-value csn (Predicate "-is-running?-")))
	94	(and val (car (cog-value->list val))))
	95
91	96	;; ===== Single cogserver =====
92	97	(define single-telnet-port 17101)
93	98	(define single-web-port 18181)
94		(define single-csn #f)
	99
	100	;; Create the CogServerNode but don't start it yet
	101	(define single-csn (CogServerNode "cogserver-single"))
	102	(cog-set-value! single-csn (Predicate "-telnet-port-") (FloatValue single-telnet-port))
	103	(cog-set-value! single-csn (Predicate "-web-port-") (FloatValue single-web-port))
	104	(cog-set-value! single-csn (Predicate "-mcp-port-") (FloatValue 0))
	105
	106	;; Test -is-running?- before start
	107	(test-assert "single-not-running-before-start"
	108	(not (cogserver-running? single-csn)))
	109
	110	;; Start the cogserver
	111	(cog-set-value! single-csn (Predicate "-start-") (VoidValue))
95	112
96	113	(test-assert "single-start"
97		(begin
98		(set! single-csn (start-named-cogserver "cogserver-single" single-telnet-port single-web-port))
99		(cog-atom? single-csn)))
	114	(cog-atom? single-csn))
	115
	116	;; Test -is-running?- after start
	117	(test-assert "single-running-after-start"
	118	(cogserver-running? single-csn))
100	119
101	120	(test-assert "single-telnet-reachable"
102	121	(can-connect-to-port? single-telnet-port))
…	…	@@ -104,10 +123,15 @@
104	123	(test-assert "single-web-reachable"
105	124	(can-connect-to-port? single-web-port))
106	125
	126	;; Stop the cogserver
	127	(stop-named-cogserver single-csn)
	128
107	129	(test-assert "single-stop"
108		(begin
109		(stop-named-cogserver single-csn)
110		#t))
	130	(not (can-connect-to-port? single-telnet-port)))
	131
	132	;; Test -is-running?- after stop
	133	(test-assert "single-not-running-after-stop"
	134	(not (cogserver-running? single-csn)))
111	135
112	136	(test-assert "single-telnet-closed"
113	137	(not (can-connect-to-port? single-telnet-port)))

opencog-cogserver commits / 6482f17

Changed files (4) +48 -8