Merge branch 'master' of https://github.com/AutoModality/am-utils into AM-172/var-logs AM-172/var-logs

Author: Aaron Roller

.github/workflows/package.yml

@@ -18,7 +18,6 @@ jobs:
         uses: AutoModality/action-package-debian-ros@v3-perception
         with:
           branch: ${{ github.event.pull_request.head.ref }}
-          pull-request-number: ${{ github.event.number }}
           build-number: ${{ github.run_number }}
           release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }}
       - name: The generated package

debian/control

@@ -4,46 +4,47 @@ Priority: extra
 Maintainer: info <info@automodality.com>
 Build-Depends: debhelper (>= 9.0.0), 
     ros-melodic-am-control-toolbox, 
-    ros-melodic-am-osdk-ros,
-    ros-melodic-image-transport,
     ros-melodic-am-msgs, 
+    ros-melodic-am-osdk-ros,
     ros-melodic-catkin, 
+    ros-melodic-cv-bridge, 
     ros-melodic-geometry-msgs, 
+    ros-melodic-image-transport,
+    ros-melodic-mavros-msgs, 
     ros-melodic-message-generation, 
     ros-melodic-nav-msgs, 
     ros-melodic-rosconsole, 
     ros-melodic-roscpp, 
     ros-melodic-rostime, 
     ros-melodic-sensor-msgs, 
     ros-melodic-std-msgs, 
-    ros-melodic-uuid-msgs,
     ros-melodic-tf2, 
     ros-melodic-tf2-ros,
     ros-melodic-tf2-sensor-msgs, 
-    ros-melodic-cv-bridge, 
-    ros-melodic-mavros-msgs, 
+    ros-melodic-uuid-msgs,
 
 Homepage: https://github.com/AutoModality/am-utils
 Standards-Version: 3.9.2
 Package: ros-melodic-am-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, 
-    ros-melodic-am-control-toolbox, 
-    ros-melodic-am-osdk-ros,
-    ros-melodic-image-transport,
+    ros-melodic-am-control-toolbox,
     ros-melodic-am-msgs, 
+    ros-melodic-am-osdk-ros,
+    ros-melodic-am-platform-scripts,
+    ros-melodic-cv-bridge, 
     ros-melodic-geometry-msgs, 
+    ros-melodic-image-transport,
+    ros-melodic-mavros-msgs, 
     ros-melodic-message-runtime, 
     ros-melodic-nav-msgs, 
     ros-melodic-rosconsole, 
     ros-melodic-roscpp, 
     ros-melodic-rostime, 
     ros-melodic-sensor-msgs, 
     ros-melodic-std-msgs, 
-    ros-melodic-uuid-msgs,
     ros-melodic-tf2, 
     ros-melodic-tf2-ros,
     ros-melodic-tf2-sensor-msgs, 
-    ros-melodic-cv-bridge, 
-    ros-melodic-mavros-msgs, 
+    ros-melodic-uuid-msgs,
 Description: Common code to assist with AutoModality libraries found in separate repositories.

debian/postinst

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+#post installation script to set up necessary resources
+
+set -e
+
+
+# provides the prod_user we use 
+include_common(){
+    source "/opt/ros/melodic/lib/am_platform_scripts/scripts/amros/amros-constants.sh"
+}
+
+# creates a log directory granting access
+# outputs a message to the screen trace upon installation
+create_log_directory(){
+
+    #helpful to the viewer of the message to know the source
+    OUTPUT_PREFIX="visbox/debian/postinst:"
+
+    dir=$1
+    user_group=$2
+
+    # create the directory if it doesn't exist
+    if [[ -d "$dir" ]];then
+        echo "$OUTPUT_PREFIX '$dir' exists to receive logs"
+    else
+        mkdir -p "$dir"
+        chown "$user_group:$user_group" "$dir"
+        echo "$OUTPUT_PREFIX '$dir' created to receive logs"
+    fi
+}
+
+# create the log directory needed for bag files.  see bag_logger.cpp
+bag_logger_dirs(){
+    
+    #amros_user comes from common scripts source
+    #this is also defined in bag_logger.cpp
+    #the log locations (/var/log/amros) are defined by the platorm installation
+    user=$(amros_app_user)
+    create_log_directory $(amros_log_dir) $user
+    create_log_directory $(amros_log_media_dir) $user
+}
+
+# main ...
+include_common
+bag_logger_dirs

include/vb_util_lib/am_util.h

@@ -8,7 +8,6 @@
 #include <vector>
 
 extern std::string get_file_contents(const char *filename);
-extern std::string getMediaFileDir(std::string prefix);
 extern std::vector<std::string> getDirNameList(std::string root);
 extern std::vector<std::string> getDirPathList(std::string root);
 extern bool fileExists(const std::string& name);

include/vb_util_lib/bag_logger.h

@@ -20,7 +20,8 @@
 #include <ros/ros.h>
 #include <rosbag/bag.h>
 
-#define DEFAULT_BAG_DIR "/home/ubuntu/testdata/"
+#define DEFAULT_BAG_DIR "/var/log/amros"
+#define DEFAULT_MEDIA_DIR "/media/amros"
 
 #define LOG_MSG(topic, msg, level) { LOG_MSG_STAMP(topic, msg, ros::Time::now(), level) }
 

src/vb_util_lib/am_util.cpp

@@ -36,29 +36,6 @@ std::string get_file_contents(const char *filename)
   throw(errno);
 }
 
-std::string getMediaFileDir(std::string prefix) {
-    using namespace std;
-    using namespace boost::filesystem;
-
-    path p("/media/ubuntu");
-    for (auto i = directory_iterator(p); i != directory_iterator(); i++)
-    {
-        if (is_directory(i->path()))
-        {
-            std::size_t found = i->path().filename().string().find(prefix);
-            if (found!=std::string::npos)
-            {
-//                cout << "FOUND: "+i->path().filename().string()+"  AT: "+i->path().string() << endl;
-                return i->path().string()+"/";
-            }
-        }
-        else
-            continue;
-    }
-
-    return string("");
-}
-
 std::vector<std::string> getDirNameList(std::string root) {
     using namespace std;
     using namespace boost::filesystem;

src/vb_util_lib/bag_logger.cpp

@@ -6,7 +6,7 @@ std::string BagLogger::getLogFileDir() {
     using namespace std;
     using namespace boost::filesystem;
 
-    path p("/media/ubuntu");
+    path p(DEFAULT_MEDIA_DIR);
     for (auto i = directory_iterator(p); i != directory_iterator(); i++)
     {
         if (is_directory(i->path()))