Raise EM::Unsupported when pid/file watching is not available

rlane · Oct 27, 2009 · 22978fd · 22978fd
1 parent 01dc31d
commit 22978fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ext/em.cpp b/ext/em.cpp
@@ -2005,7 +2005,7 @@ const unsigned long EventMachine_t::WatchPid (int pid)
 {
 	#ifdef HAVE_KQUEUE
 	if (!bKqueue)
-		throw std::runtime_error("must enable kqueue");
+		throw std::runtime_error("must enable kqueue (EM.kqueue=true) for pid watching support");
 
 	struct kevent event;
 	int kqres;
@@ -2104,7 +2104,7 @@ const unsigned long EventMachine_t::WatchFile (const char *fpath)
 
 	#ifdef HAVE_KQUEUE
 	if (!bKqueue)
-		throw std::runtime_error("must enable kqueue");
+		throw std::runtime_error("must enable kqueue (EM.kqueue=true) for file watching support");
 
 	// With kqueue we have to open the file first and use the resulting fd to register for events
 	wd = open(fpath, O_RDONLY);

diff --git a/ext/rubymain.cpp b/ext/rubymain.cpp
@@ -769,7 +769,7 @@ static VALUE t_watch_filename (VALUE self, VALUE fname)
 	try {
 		return ULONG2NUM(evma_watch_filename(StringValuePtr(fname)));
 	} catch (std::runtime_error e) {
-		rb_sys_fail(e.what());
+		rb_raise (EM_eUnsupported, e.what());
 	}
 }
 
@@ -794,7 +794,7 @@ static VALUE t_watch_pid (VALUE self, VALUE pid)
 	try {
 		return ULONG2NUM(evma_watch_pid(NUM2INT(pid)));
 	} catch (std::runtime_error e) {
-		rb_sys_fail(e.what());
+		rb_raise (EM_eUnsupported, e.what());
 	}
 }